Merge 'cd/master'

This commit is contained in:
makefu 2016-07-18 12:15:10 +02:00
commit e2126ae7ee

View file

@ -20,20 +20,22 @@ with config.krebs.lib;
dns.providers.siem = "hosts"; dns.providers.siem = "hosts";
dns.providers.lan = "hosts"; dns.providers.lan = "hosts";
search-domain = "retiolum"; search-domain = "retiolum";
build = { build = {
user = config.krebs.users.makefu; user = config.krebs.users.makefu;
source = mapAttrs (_: mkDefault) { source = let inherit (config.krebs.build) host user; in {
nixpkgs = { nixpkgs.git = {
url = https://github.com/nixos/nixpkgs; url = https://github.com/nixos/nixpkgs;
rev = "0546a4a"; # stable @ 2016-06-11 rev = "0546a4a"; # stable @ 2016-06-11
}; };
secrets = if getEnv "dummy_secrets" == "true" secrets.file =
then toString <stockholm/makefu/6tests/data/secrets> if getEnv "dummy_secrets" == "true"
else "/home/makefu/secrets/${config.krebs.build.host.name}"; then toString <stockholm/makefu/6tests/data/secrets>
stockholm = "/home/makefu/stockholm"; else "/home/makefu/secrets/${host.name}";
stockholm.file = "/home/makefu/stockholm";
# Defaults for all stockholm users? # 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";
}; };
}; };
}; };