diff options
| author | tv <tv@krebsco.de> | 2023-09-11 15:31:13 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2023-09-11 16:10:41 +0200 |
| commit | 5370e0485788224126861e076110ac705013d2de (patch) | |
| tree | 15838192c1ebf685733cbf39b3f3e37fd1ebd639 /tv/3modules | |
| parent | 8fc162ee3d9525a2b45346a1ca8f34ccb5ef971b (diff) | |
treewide: don't reference <secrets> explicitly
Diffstat (limited to 'tv/3modules')
| -rw-r--r-- | tv/3modules/charybdis/default.nix | 4 | ||||
| -rw-r--r-- | tv/3modules/ejabberd/default.nix | 2 | ||||
| -rw-r--r-- | tv/3modules/wwan.nix | 2 | ||||
| -rw-r--r-- | tv/3modules/x0vncserver.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tv/3modules/charybdis/default.nix b/tv/3modules/charybdis/default.nix index 4a0f9950..1fdcea57 100644 --- a/tv/3modules/charybdis/default.nix +++ b/tv/3modules/charybdis/default.nix @@ -17,11 +17,11 @@ in { }; ssl_dh_params = mkOption { type = types.absolute-pathname; - default = toString <secrets> + "/charybdis.dh.pem"; + default = "${config.krebs.secret.directory}/charybdis.dh.pem"; }; ssl_private_key = mkOption { type = types.absolute-pathname; - default = toString <secrets> + "/charybdis.key.pem"; + default = "${config.krebs.secret.directory}/charybdis.key.pem"; }; sslport = mkOption { type = types.int; diff --git a/tv/3modules/ejabberd/default.nix b/tv/3modules/ejabberd/default.nix index 71a1a597..61fd8fdf 100644 --- a/tv/3modules/ejabberd/default.nix +++ b/tv/3modules/ejabberd/default.nix @@ -20,7 +20,7 @@ in { certfiles = mkOption { type = types.listOf types.absolute-pathname; default = [ - (toString <secrets> + "/ejabberd.pem") + "${config.krebs.secret.directory}/ejabberd.pem" ]; }; configFile = mkOption { diff --git a/tv/3modules/wwan.nix b/tv/3modules/wwan.nix index 382f5a53..0cdfbf36 100644 --- a/tv/3modules/wwan.nix +++ b/tv/3modules/wwan.nix @@ -19,7 +19,7 @@ with import ./lib; }; tv.wwan.secrets = mkOption { type = with types; pathname; - default = toString <secrets/wwan.json>; + default = "${config.krebs.secret.directory}/wwan.json"; # format: {"pin1":number} }; }; diff --git a/tv/3modules/x0vncserver.nix b/tv/3modules/x0vncserver.nix index eb9b1ae4..c8e23d06 100644 --- a/tv/3modules/x0vncserver.nix +++ b/tv/3modules/x0vncserver.nix @@ -9,7 +9,7 @@ in { }; enable = mkEnableOption "tv.x0vncserver"; pwfile = mkOption { - default = toString <secrets> + "/vncpasswd"; + default = "${config.krebs.secret.directory}/vncpasswd"; description = '' Use vncpasswd to edit pwfile. See: nix-shell -p tigervnc --run 'man vncpasswd' |