summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/systemd-credentials.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/modules/systemd-credentials.nix b/modules/systemd-credentials.nix
index ab7fbd9..3ccc452 100644
--- a/modules/systemd-credentials.nix
+++ b/modules/systemd-credentials.nix
@@ -1,6 +1,4 @@
-{ config, pkgs, lib, ... }: let {
-
- slib = lib.slib or (import ../../lib/pure.nix { inherit lib; });
+{ config, pkgs, lib, mylib, ... }: let {
# stockholm's tinc, repo-sync, and exim-smarthost still use the old name.
body.imports = [
@@ -19,14 +17,14 @@
lib.sort
lib.lessThan
(lib.filter
- slib.types.absolute-pathname.check
+ mylib.types.absolute-pathname.check
(map
- (slib.compose [ slib.maybeHead (builtins.match "[^:]*:(.*)") ])
+ (mylib.compose [ mylib.maybeHead (builtins.match "[^:]*:(.*)") ])
(lib.toList cfg.serviceConfig.LoadCredential)));
readOnly = true;
};
credentialUnitName = lib.mkOption {
- default = "trigger-${slib.systemd.encodeName serviceName}";
+ default = "trigger-${mylib.systemd.encodeName serviceName}";
readOnly = true;
};
restartIfCredentialsChange = lib.mkOption {
@@ -60,7 +58,7 @@
pkgs.systemd
]}
- cache=/var/lib/credentials/${slib.shell.escape serviceName}.sha1sum
+ cache=/var/lib/credentials/${mylib.shell.escape serviceName}.sha1sum
tmpfile=$(mktemp -t "$(basename "$cache")".XXXXXXXX)
trap 'rm -f "$tmpfile"' EXIT
@@ -70,7 +68,7 @@
fi
mv "$tmpfile" "$cache"
- systemctl restart ${slib.shell.escape serviceName}
+ systemctl restart ${mylib.shell.escape serviceName}
'';
};
};