diff options
| author | lassulus <lass@aidsballs.de> | 2015-10-25 21:27:14 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-10-25 21:27:14 +0100 |
| commit | cc5220a4477e290f1833e609fed1e0f9f56e4a41 (patch) | |
| tree | f7032b6126c6daac3e2d2e5ad9c5d628a7a3e34a /krebs | |
| parent | ace11d79badafce313b17c968701739513e95982 (diff) | |
| parent | cca25c7b66c44e0ec826d466bd48f2463df03fe9 (diff) | |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/default.nix | 4 | ||||
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 1 |
2 files changed, 3 insertions, 2 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 d328033cc..e36a083f2 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -185,6 +185,7 @@ with lib; addrs6 = ["42:6e1e:cc8a:7cef:827:f938:8c64:baad"]; aliases = [ "graphs.wry.retiolum" + "graphs.retiolum" "paste.wry.retiolum" "paste.retiolum" "wry.retiolum" |