summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-07-18 12:15:10 +0200
committermakefu <github@syntax-fehler.de>2016-07-18 12:15:10 +0200
commit33c96a89c5c72218a1c9f16bcea5909cd5135768 (patch)
tree065d79ba654a2e53e3b837b9f7e14987ed94e99a /makefu
parentd9028c51320d29d8ed15dff7a9fb7a3eb16f52ff (diff)
parente2157dade8a359f81b1e6260f3c9c6e8d36360e5 (diff)
Merge 'cd/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/2configs/default.nix18
1 files changed, 10 insertions, 8 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 25c2996c6..f3bf0c46e 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -20,20 +20,22 @@ with config.krebs.lib;
dns.providers.siem = "hosts";
dns.providers.lan = "hosts";
search-domain = "retiolum";
- build = {
+ build = {
user = config.krebs.users.makefu;
- source = mapAttrs (_: mkDefault) {
- nixpkgs = {
+ source = let inherit (config.krebs.build) host user; in {
+ nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
rev = "0546a4a"; # stable @ 2016-06-11
};
- 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";
+ secrets.file =
+ if getEnv "dummy_secrets" == "true"
+ then toString <stockholm/makefu/6tests/data/secrets>
+ else "/home/makefu/secrets/${host.name}";
+ stockholm.file = "/home/makefu/stockholm";
# Defaults for all stockholm users?
- nixos-config = "symlink:stockholm/${config.krebs.build.user.name}/1systems/${config.krebs.build.host.name}.nix";
+ nixos-config.symlink =
+ "stockholm/${user.name}/1systems/${host.name}.nix";
};
};
};