diff options
| author | lassulus <lass@lassul.us> | 2017-06-20 16:05:27 +0200 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2017-06-20 16:05:27 +0200 |
| commit | f0bcc6e1f147726cbbf8c3d8a9da503886d2321d (patch) | |
| tree | bf8e0eabe03a8dcf9201c580ab1f4ecc4660b8b4 /tv/2configs/default.nix | |
| parent | bda14221cf46003ecf76756a5db7422c70737c85 (diff) | |
| parent | 57c6b890f9088bb333eeab215ecfeca9d09ce3ef (diff) | |
Merge remote-tracking branch 'ni/master' into HEAD
Diffstat (limited to 'tv/2configs/default.nix')
| -rw-r--r-- | tv/2configs/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index b1d739ef3..4a1247ef5 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -9,12 +9,15 @@ with import <stockholm/lib>; user = config.krebs.users.tv; source = let inherit (config.krebs.build) host; in { nixos-config.symlink = "stockholm/tv/1systems/${host.name}.nix"; - secrets.file = "/home/tv/secrets/${host.name}"; + secrets.file = + if getEnv "dummy_secrets" == "true" + then toString <stockholm/tv/dummy_secrets> + else "/home/tv/secrets/${host.name}"; secrets-common.file = "/home/tv/secrets/common"; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "99dfb6dce37edcd1db7cb85c2db97089d9d5f442"; # nixos-17.03 + ref = "412b0a17aa2975e092c7ab95a38561c5f82908d4"; # nixos-17.03 }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; @@ -41,6 +44,7 @@ with import <stockholm/lib>; gnumake hashPassword populate + whatsupnix ]; } { |