diff options
| author | tv <tv@shackspace.de> | 2015-09-27 00:22:50 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-09-27 00:37:20 +0200 |
| commit | c9ccf22b154205caf55262ba6aa305e2c2247a02 (patch) | |
| tree | 1190657c3702bbeada39de2c449a17aea3d931c5 /tv/2configs | |
| parent | 9157c6fbc9e355dd7a6ea8c9e33a280492a4d35b (diff) | |
krebs.build: merge deploy and infest
Diffstat (limited to 'tv/2configs')
| -rw-r--r-- | tv/2configs/base.nix | 3 | ||||
| -rw-r--r-- | tv/2configs/charybdis.nix | 4 | ||||
| -rw-r--r-- | tv/2configs/git.nix | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix index 89a66115..1c6eba66 100644 --- a/tv/2configs/base.nix +++ b/tv/2configs/base.nix @@ -15,9 +15,10 @@ in imports = [ { + # TODO never put hashedPassword into the store users.extraUsers = mapAttrs (_: h: { hashedPassword = h; }) - (import /root/src/secrets/hashedPasswords.nix); + (import <secrets/hashedPasswords.nix>); } { users.defaultUserShell = "/run/current-system/sw/bin/bash"; diff --git a/tv/2configs/charybdis.nix b/tv/2configs/charybdis.nix index a949026d..80c6f7c4 100644 --- a/tv/2configs/charybdis.nix +++ b/tv/2configs/charybdis.nix @@ -21,7 +21,7 @@ let }; dhParams = mkOption { type = types.str; - default = "/root/src/secrets/charybdis.dh.pem"; + default = toString <secrets/charybdis.dh.pem>; }; motd = mkOption { type = types.str; @@ -32,7 +32,7 @@ let }; sslKey = mkOption { type = types.str; - default = "/root/src/secrets/charybdis.key.pem"; + default = toString <secrets/charybdis.key.pem>; }; }; diff --git a/tv/2configs/git.nix b/tv/2configs/git.nix index 6624d62d..5f5fae48 100644 --- a/tv/2configs/git.nix +++ b/tv/2configs/git.nix @@ -51,7 +51,8 @@ let collaborators = with config.krebs.users; [ lass makefu ]; }; } // - import /root/src/secrets/repos.nix { inherit config lib pkgs; } + # TODO don't put secrets/repos.nix into the store + import <secrets/repos.nix> { inherit config lib pkgs; } ); make-public-repo = name: { desc ? null, ... }: { |