summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-06-23 18:50:53 +0200
committerlassulus <lass@aidsballs.de>2016-06-23 18:50:53 +0200
commitf22111ea950481a508f03f2de7a01962fd0d56e2 (patch)
tree547ec08ac940d6f4d63cd081093b4bc28a3874e5 /makefu/2configs
parent3d1f3e697db96491adbe49fc516489fab81f6617 (diff)
parentb709634ce9e61323b19aaf1b31c433f79f556fad (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index a753e6777..422927b28 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -26,7 +26,9 @@ with config.krebs.lib;
url = https://github.com/nixos/nixpkgs;
rev = "63b9785"; # stable @ 2016-06-01
};
- secrets = "/home/makefu/secrets/${config.krebs.build.host.name}/";
+ secrets = if getEnv "dummy_secrets" == "true"
+ then toString <stockholm/makefu/6tests/data/secrets>
+ else "/home/makefu/secrets/${config.krebs.build.host.name}";
stockholm = "/home/makefu/stockholm";
# Defaults for all stockholm users?