From a0ec59394d8d195818c3a5942363829594b39d08 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Wed, 15 May 2024 08:36:29 +0700 Subject: [PATCH] update coop-fd --- flake.lock | 22 +++++++++++----------- flake.nix | 6 +++--- system/hosts/server/home.nix | 6 +++--- system/modules/impermanence.nix | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index aa679c4..c5e196f 100644 --- a/flake.lock +++ b/flake.lock @@ -16,7 +16,7 @@ "type": "gitlab" } }, - "coop-ofd": { + "coop-fd": { "inputs": { "crane": "crane", "flake-compat": "flake-compat", @@ -25,32 +25,32 @@ ] }, "locked": { - "lastModified": 1712785740, - "narHash": "sha256-5r88elsHgFXDdr/NOwK+2oKMfrFqcXV4tQPhVXTLI0E=", + "lastModified": 1715464067, + "narHash": "sha256-TlG5vT+473QV2IHTpRe43K8TF2kboWCjiIsa63pEzNo=", "owner": "chayleaf", - "repo": "coop-ofd", - "rev": "348dbe813090de3c3b694695699439893df8ad62", + "repo": "coop-fd", + "rev": "0ac65ba71562f83e70d1c778191b0b70cd97ce88", "type": "github" }, "original": { "owner": "chayleaf", - "repo": "coop-ofd", + "repo": "coop-fd", "type": "github" } }, "crane": { "inputs": { "nixpkgs": [ - "coop-ofd", + "coop-fd", "nixpkgs" ] }, "locked": { - "lastModified": 1700327093, - "narHash": "sha256-OgYvlBABxJYWhZ/HBd0bPVcIEkT+xDhDCpRYqtVhYWY=", + "lastModified": 1715274763, + "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", "owner": "ipetkov", "repo": "crane", - "rev": "ae7cd510e508ee03d792005c2f1c0a3ff25ecb80", + "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", "type": "github" }, "original": { @@ -385,7 +385,7 @@ }, "root": { "inputs": { - "coop-ofd": "coop-ofd", + "coop-fd": "coop-fd", "flake-compat": "flake-compat_2", "home-manager": "home-manager", "impermanence": "impermanence", diff --git a/flake.nix b/flake.nix index 0c5e303..b9c5e35 100644 --- a/flake.nix +++ b/flake.nix @@ -21,8 +21,8 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - coop-ofd = { - url = "github:chayleaf/coop-ofd"; + coop-fd = { + url = "github:chayleaf/coop-fd"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { @@ -60,7 +60,7 @@ # --impure required for developing # it takes the paths for modules from filesystem as opposed to flake inputs dev = { - # coop-ofd = true; + # coop-fd = true; # home-manager = true; # mobile-nixos = true; # nixos-router = true; diff --git a/system/hosts/server/home.nix b/system/hosts/server/home.nix index 9af4473..0785561 100644 --- a/system/hosts/server/home.nix +++ b/system/hosts/server/home.nix @@ -17,7 +17,7 @@ let withQt5 = false; }; in { - imports = [ inputs.coop-ofd.nixosModules.default ]; + imports = [ inputs.coop-fd.nixosModules.default ]; # a bunch of services for personal use not intended for the public # TODO: keycloakify this @@ -45,7 +45,7 @@ in { # services.keycloak.plugins = [ pkgs.keycloak.plugins.keycloak-metrics-spi ]; services.keycloak.settings.metrics-enabled = true; - services.coop-ofd = { + services.coop-fd = { enable = true; config.listener = "127.0.0.1:25783"; }; @@ -74,7 +74,7 @@ in { proxyWebsockets = true; }; locations."/money/" = { - proxyPass = "http://${config.services.coop-ofd.config.listener}/"; + proxyPass = "http://${config.services.coop-fd.config.listener}/"; }; }; services.nginx.virtualHosts."hydra.${cfg.domainName}" = { diff --git a/system/modules/impermanence.nix b/system/modules/impermanence.nix index e5816f3..10384ee 100644 --- a/system/modules/impermanence.nix +++ b/system/modules/impermanence.nix @@ -76,8 +76,8 @@ in { { directory = /var/cache/sccache; user = "root"; group = "nixbld"; mode = "0770"; } ] ++ lib.optionals config.services.certspotter.enable [ { directory = /var/lib/certspotter; user = "certspotter"; group = "certspotter"; mode = "0755"; } - ] ++ lib.optionals (config.services.coop-ofd.enable or false) [ - { directory = /var/lib/private/coop-ofd; mode = "0750"; defaultPerms.mode = "0700"; } + ] ++ lib.optionals (config.services.coop-fd.enable or false) [ + { directory = /var/lib/private/coop-fd; mode = "0750"; defaultPerms.mode = "0700"; } ] ++ lib.optionals config.services.dovecot2.enable [ { directory = /var/lib/dhparams; user = "root"; group = "root"; mode = "0755"; } { directory = /var/lib/dovecot; user = "root"; group = "root"; mode = "0755"; }