diff options
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/default.nix | 4 | ||||
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index e244ef7b7..e0c3b00f8 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -105,8 +105,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 ); diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 4f8f964f8..d328033cc 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -91,7 +91,8 @@ with lib; extraZones = { "krebsco.de" = '' mediengewitter IN A ${head nets.internet.addrs4} - flap IN A ${head nets.internet.addrs4}''; + flap IN A ${head nets.internet.addrs4} + ''; }; nets = { internet = { @@ -125,11 +126,11 @@ with lib; extraZones = { "krebsco.de" = '' - IN MX 10 mx42 euer IN MX 1 aspmx.l.google.com. pigstarter IN A ${head nets.internet.addrs4} gold IN A ${head nets.internet.addrs4} - boot IN A ${head nets.internet.addrs4}''; + boot IN A ${head nets.internet.addrs4} + ''; }; nets = { internet = { @@ -168,7 +169,7 @@ with lib; graphs IN A ${head nets.internet.addrs4} paste 60 IN A ${head nets.internet.addrs4} tinc IN A ${head nets.internet.addrs4} - ''; + ''; }; nets = rec { internet = { @@ -214,7 +215,8 @@ with lib; "krebsco.de" = '' omo IN A ${head nets.internet.addrs4} euer IN A ${head nets.internet.addrs4} - gum IN A ${head nets.internet.addrs4} ''; + gum IN A ${head nets.internet.addrs4} + ''; }; nets = { internet = { |