diff options
| author | makefu <github@syntax-fehler.de> | 2015-10-27 18:12:29 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-10-27 18:12:29 +0100 |
| commit | a85114c59c5102b839584f72454bca2c8abbb887 (patch) | |
| tree | 18fc24394171f4afae3dee0e68e3781df75723ea /krebs/3modules/default.nix | |
| parent | fe4f5b98b91f6bacb036d57b5322fb4e09c22f14 (diff) | |
| parent | 20ad77468131b7c69c5b3a26ea149ae7fdc0173b (diff) | |
Merge branch 'master' of pnp:stockholm
Diffstat (limited to 'krebs/3modules/default.nix')
| -rw-r--r-- | krebs/3modules/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 075db1826..fd9d56ed2 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -1,6 +1,6 @@ { config, lib, ... }: -with import ../4lib { inherit lib; }; +with lib; let cfg = config.krebs; @@ -8,6 +8,7 @@ let imports = [ ./bepasty-server.nix ./build.nix + ./current.nix ./exim-retiolum.nix ./exim-smarthost.nix ./github-hosts-sync.nix @@ -76,6 +77,7 @@ let imp = mkMerge [ { krebs = import ./lass { inherit lib; }; } { krebs = import ./makefu { inherit lib; }; } + { krebs = import ./shared { inherit lib; }; } { krebs = import ./tv { inherit lib; }; } { krebs.dns.providers = { @@ -105,8 +107,8 @@ let # Implements environment.etc."zones/<zone-name>" environment.etc = let - stripEmptyLines = s: concatStringsSep "\n" - (remove "\n" (remove "" (splitString "\n" s))); + stripEmptyLines = s: (concatStringsSep "\n" + (remove "\n" (remove "" (splitString "\n" s)))) + "\n"; all-zones = foldAttrs (sum: current: sum + "\n" +current ) "" ([cfg.zone-head-config] ++ combined-hosts); combined-hosts = (mapAttrsToList (name: value: value.extraZones) cfg.hosts ); |