From 8f785237b2dc46c63272e360cece351b2974cb6d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 30 Nov 2017 22:35:04 +0100
Subject: zones module: init (import from default.nix)

---
 krebs/3modules/default.nix | 12 +-----------
 krebs/3modules/zones.nix   | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 krebs/3modules/zones.nix

(limited to 'krebs')

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index c89f3229..a8933e71 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -44,6 +44,7 @@ let
       ./tinc_graphs.nix
       ./urlwatch.nix
       ./repo-sync.nix
+      ./zones.nix
     ];
     options.krebs = api;
     config = lib.mkIf cfg.enable imp;
@@ -171,17 +172,6 @@ let
             '';
           };
 
-      # Implements environment.etc."zones/<zone-name>"
-      environment.etc = let
-        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 );
-      in lib.mapAttrs' (name: value: nameValuePair
-        ("zones/" + name)
-        { text=(stripEmptyLines value); }) all-zones;
-
       krebs.exim-smarthost.internet-aliases = let
         format = from: to: {
           inherit from;
diff --git a/krebs/3modules/zones.nix b/krebs/3modules/zones.nix
new file mode 100644
index 00000000..eb135186
--- /dev/null
+++ b/krebs/3modules/zones.nix
@@ -0,0 +1,22 @@
+with import <stockholm/lib>;
+{ config, ... }: {
+
+  config = {
+    # Implements environment.etc."zones/<zone-name>"
+    environment.etc = let
+      stripEmptyLines = s: (concatStringsSep "\n"
+        (remove "\n" (remove "" (splitString "\n" s)))) + "\n";
+      all-zones = foldAttrs (sum: current: sum + "\n" +current ) ""
+        ([config.krebs.zone-head-config] ++ combined-hosts);
+      combined-hosts =
+        mapAttrsToList (name: getAttr "extraZones") config.krebs.hosts;
+    in
+      mapAttrs'
+        (name: value: {
+          name = "zones/${name}";
+          value.text = stripEmptyLines value;
+        })
+        all-zones;
+  };
+
+}
-- 
cgit v1.2.3