summaryrefslogtreecommitdiffstats
path: root/lass/2configs/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-07-18 12:15:50 +0200
committerlassulus <lass@aidsballs.de>2016-07-18 12:15:50 +0200
commitaf1959e3bdaabc004663c2dc2120148c18aa6b7c (patch)
treee9f5237e90903a3a1fede41dc2300cffd405e817 /lass/2configs/default.nix
parenta71a9ed33a92ba901f7c605506bb2c3ee506e6c7 (diff)
parent33c96a89c5c72218a1c9f16bcea5909cd5135768 (diff)
Merge remote-tracking branch 'gum/master' into new-populate
Diffstat (limited to 'lass/2configs/default.nix')
-rw-r--r--lass/2configs/default.nix18
1 files changed, 8 insertions, 10 deletions
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 7bf8e82e4..81abff3ed 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -53,16 +53,14 @@ with config.krebs.lib;
search-domain = "retiolum";
build = {
user = config.krebs.users.lass;
- source = mapAttrs (_: mkDefault) ({
- nixos-config = "symlink:stockholm/lass/1systems/${config.krebs.build.host.name}.nix";
- secrets = if getEnv "dummy_secrets" == "true"
- then toString <stockholm/lass/2configs/tests/dummy-secrets>
- else "/home/lass/secrets/${config.krebs.build.host.name}";
- #secrets-common = "/home/lass/secrets/common";
- stockholm = getEnv "PWD";
- } // optionalAttrs config.krebs.build.host.secure {
- #secrets-master = "/home/lass/secrets/master";
- });
+ source = let inherit (config.krebs.build) host; in {
+ nixos-config.symlink = "stockholm/lass/1systems/${host.name}.nix";
+ secrets.file =
+ if getEnv "dummy_secrets" == "true"
+ then toString <stockholm/lass/2configs/tests/dummy-secrets>
+ else "/home/lass/secrets/${host.name}";
+ stockholm.file = getEnv "PWD";
+ };
};
};