From 6e8bb6c8e3cc18b505184746dd635afd7a5b2bc3 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 18 Nov 2026 12:56:08 +0000 Subject: systemd-credentials: rename krebs.systemd to hrm.systemd The file was modules/krebs-systemd.nix to stay clear of modules/systemd.nix. krebs.systemd.services stays as an alias for stockholm's tinc, repo-sync, and exim-smarthost. --- modules/charybdis/default.nix | 2 +- modules/ejabberd/default.nix | 2 +- modules/krebs-systemd.nix | 73 -------------------------------------- modules/systemd-credentials.nix | 78 +++++++++++++++++++++++++++++++++++++++++ modules/unbound.nix | 2 +- modules/x0vncserver.nix | 2 +- 6 files changed, 82 insertions(+), 77 deletions(-) delete mode 100644 modules/krebs-systemd.nix create mode 100644 modules/systemd-credentials.nix 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/krebs-systemd.nix deleted file mode 100644 index c0bd476..0000000 --- a/modules/krebs-systemd.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ config, pkgs, lib, ... }: let { - - slib = lib.slib or (import ../../lib/pure.nix { inherit lib; }); - - body.options.krebs.systemd.services = lib.mkOption { - default = {}; - type = lib.types.attrsOf (lib.types.submodule (cfg_: let - serviceName = cfg_.config._module.args.name; - cfg = config.systemd.services.${serviceName} // cfg_.config; - in { - options = { - credentialPaths = lib.mkOption { - default = - lib.sort - lib.lessThan - (lib.filter - slib.types.absolute-pathname.check - (map - (slib.compose [ slib.maybeHead (builtins.match "[^:]*:(.*)") ]) - (lib.toList cfg.serviceConfig.LoadCredential))); - readOnly = true; - }; - credentialUnitName = lib.mkOption { - default = "trigger-${slib.systemd.encodeName serviceName}"; - readOnly = true; - }; - restartIfCredentialsChange = lib.mkOption { - default = false; - description = '' - Whether to restart the service whenever any of its credentials - change. Only credentials with an absolute path in LoadCredential= - are supported. - ''; - type = lib.types.bool; - }; - }; - })); - }; - - body.config.systemd = lib.mkMerge (lib.mapAttrsToList (serviceName: cfg: { - paths.${cfg.credentialUnitName} = { - wantedBy = [ "multi-user.target" ]; - pathConfig.PathChanged = cfg.credentialPaths; - }; - services.${cfg.credentialUnitName} = { - serviceConfig = { - Type = "oneshot"; - StateDirectory = "credentials"; - ExecStart = pkgs.writeDash "${cfg.credentialUnitName}.sh" '' - set -efu - - PATH=${lib.makeBinPath [ - pkgs.coreutils - pkgs.diffutils - pkgs.systemd - ]} - - cache=/var/lib/credentials/${slib.shell.escape serviceName}.sha1sum - tmpfile=$(mktemp -t "$(basename "$cache")".XXXXXXXX) - trap 'rm -f "$tmpfile"' EXIT - - sha1sum ${toString cfg.credentialPaths} > "$tmpfile" - if test -f "$cache" && cmp -s "$tmpfile" "$cache"; then - exit - fi - mv "$tmpfile" "$cache" - - systemctl restart ${slib.shell.escape serviceName} - ''; - }; - }; - }) config.krebs.systemd.services); -} diff --git a/modules/systemd-credentials.nix b/modules/systemd-credentials.nix new file mode 100644 index 0000000..ab7fbd9 --- /dev/null +++ b/modules/systemd-credentials.nix @@ -0,0 +1,78 @@ +{ config, pkgs, lib, ... }: let { + + slib = lib.slib or (import ../../lib/pure.nix { inherit lib; }); + + # 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; + cfg = config.systemd.services.${serviceName} // cfg_.config; + in { + options = { + credentialPaths = lib.mkOption { + default = + lib.sort + lib.lessThan + (lib.filter + slib.types.absolute-pathname.check + (map + (slib.compose [ slib.maybeHead (builtins.match "[^:]*:(.*)") ]) + (lib.toList cfg.serviceConfig.LoadCredential))); + readOnly = true; + }; + credentialUnitName = lib.mkOption { + default = "trigger-${slib.systemd.encodeName serviceName}"; + readOnly = true; + }; + restartIfCredentialsChange = lib.mkOption { + default = false; + description = '' + Whether to restart the service whenever any of its credentials + change. Only credentials with an absolute path in LoadCredential= + are supported. + ''; + type = lib.types.bool; + }; + }; + })); + }; + + body.config.systemd = lib.mkMerge (lib.mapAttrsToList (serviceName: cfg: { + paths.${cfg.credentialUnitName} = { + wantedBy = [ "multi-user.target" ]; + pathConfig.PathChanged = cfg.credentialPaths; + }; + services.${cfg.credentialUnitName} = { + serviceConfig = { + Type = "oneshot"; + StateDirectory = "credentials"; + ExecStart = pkgs.writeDash "${cfg.credentialUnitName}.sh" '' + set -efu + + PATH=${lib.makeBinPath [ + pkgs.coreutils + pkgs.diffutils + pkgs.systemd + ]} + + cache=/var/lib/credentials/${slib.shell.escape serviceName}.sha1sum + tmpfile=$(mktemp -t "$(basename "$cache")".XXXXXXXX) + trap 'rm -f "$tmpfile"' EXIT + + sha1sum ${toString cfg.credentialPaths} > "$tmpfile" + if test -f "$cache" && cmp -s "$tmpfile" "$cache"; then + exit + fi + mv "$tmpfile" "$cache" + + systemctl restart ${slib.shell.escape serviceName} + ''; + }; + }; + }) 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" ]; -- cgit v1.3.1