diff options
| -rw-r--r-- | modules/charybdis/default.nix | 2 | ||||
| -rw-r--r-- | modules/ejabberd/default.nix | 2 | ||||
| -rw-r--r-- | modules/systemd-credentials.nix (renamed from modules/krebs-systemd.nix) | 9 | ||||
| -rw-r--r-- | modules/unbound.nix | 2 | ||||
| -rw-r--r-- | modules/x0vncserver.nix | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/modules/charybdis/default.nix b/modules/charybdis/default.nix index 337ea13..4b25a2a 100644 --- a/modules/charybdis/default.nix +++ b/modules/charybdis/default.nix @@ -38,7 +38,7 @@ in { environment.etc."charybdis-ircd.motd".text = cfg.motd; - krebs.systemd.services.charybdis = {}; + hrm.systemd.services.charybdis = {}; systemd.services.charybdis = { wantedBy = [ "multi-user.target" ]; diff --git a/modules/ejabberd/default.nix b/modules/ejabberd/default.nix index 9607741..d5c1b28 100644 --- a/modules/ejabberd/default.nix +++ b/modules/ejabberd/default.nix @@ -126,7 +126,7 @@ in { }) ]; - krebs.systemd.services.ejabberd.restartIfCredentialsChange = true; + hrm.systemd.services.ejabberd.restartIfCredentialsChange = true; systemd.services.ejabberd = { wantedBy = [ "multi-user.target" ]; diff --git a/modules/krebs-systemd.nix b/modules/systemd-credentials.nix index c0bd476..ab7fbd9 100644 --- a/modules/krebs-systemd.nix +++ b/modules/systemd-credentials.nix @@ -2,7 +2,12 @@ slib = lib.slib or (import ../../lib/pure.nix { inherit lib; }); - body.options.krebs.systemd.services = lib.mkOption { + # stockholm's tinc, repo-sync, and exim-smarthost still use the old name. + body.imports = [ + (lib.mkAliasOptionModule [ "krebs" "systemd" "services" ] [ "hrm" "systemd" "services" ]) + ]; + + body.options.hrm.systemd.services = lib.mkOption { default = {}; type = lib.types.attrsOf (lib.types.submodule (cfg_: let serviceName = cfg_.config._module.args.name; @@ -69,5 +74,5 @@ ''; }; }; - }) config.krebs.systemd.services); + }) config.hrm.systemd.services); } diff --git a/modules/unbound.nix b/modules/unbound.nix index 6a51027..c793789 100644 --- a/modules/unbound.nix +++ b/modules/unbound.nix @@ -73,7 +73,7 @@ tls-service-key = "/run/credentials/unbound.service/tls-service-key"; tls-service-pem = "/run/credentials/unbound.service/tls-service-pem"; }; - krebs.systemd.services.unbound.restartIfCredentialsChange = true; + hrm.systemd.services.unbound.restartIfCredentialsChange = true; systemd.services.unbound.serviceConfig.LoadCredential = [ "tls-service-key:/var/lib/acme/${cfg.useACMEHost}/key.pem" "tls-service-pem:/var/lib/acme/${cfg.useACMEHost}/fullchain.pem" diff --git a/modules/x0vncserver.nix b/modules/x0vncserver.nix index d24c2d0..48c8da1 100644 --- a/modules/x0vncserver.nix +++ b/modules/x0vncserver.nix @@ -25,7 +25,7 @@ in { }; }; config = lib.mkIf cfg.enable { - krebs.systemd.services.x0vncserver.restartIfCredentialsChange = true; + hrm.systemd.services.x0vncserver.restartIfCredentialsChange = true; systemd.services.x0vncserver = { after = [ "graphical.target" ]; requires = [ "graphical.target" ]; |
