Merge remote-tracking branch 'ni/master'

5 files changed, 42 insertions, 34 deletions

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 70fc05813..e8f5d1611 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -49,6 +49,7 @@ let
       ./secret.nix
       ./setuid.nix
       ./shadow.nix
+      ./sitemap.nix
       ./ssl.nix
       ./sync-containers.nix
       ./systemd.nix
@@ -56,6 +57,7 @@ let
       ./tinc_graphs.nix
       ./upstream
       ./urlwatch.nix
+      ./users.nix
       ./xresources.nix
       ./zones.nix
     ];
@@ -66,15 +68,6 @@ let
   api = {
     enable = mkEnableOption "krebs";
 
-    users = mkOption {
-      type = with types; attrsOf user;
-    };
-
-    sitemap = mkOption {
-      default = {};
-      type = types.attrsOf types.sitemap.entry;
-    };
-
     zone-head-config  = mkOption {
       type = with types; attrsOf str;
       description = ''
@@ -102,28 +95,6 @@ let
 
   imp = lib.mkMerge [
     {
-      krebs.dns.providers = {
-        "krebsco.de" = "zones";
-        shack = "hosts";
-        i = "hosts";
-        r = "hosts";
-        w = "hosts";
-      };
-
-      krebs.dns.search-domain = mkDefault "r";
-
-      krebs.users = {
-        krebs = {
-          home = "/krebs";
-          mail = "spam@krebsco.de";
-        };
-        root = {
-          home = "/root";
-          pubkey = config.krebs.build.host.ssh.pubkey;
-          uid = 0;
-        };
-      };
-
       services.openssh.hostKeys =
         let inherit (config.krebs.build.host.ssh) privkey; in
         mkIf (privkey != null) [privkey];
diff --git a/krebs/3modules/dns.nix b/krebs/3modules/dns.nix
index 8acc4ccd8..8a74d3067 100644
--- a/krebs/3modules/dns.nix
+++ b/krebs/3modules/dns.nix
@@ -1,12 +1,21 @@
 with import <stockholm/lib>;
-{
+{ config, ... }: {
   options = {
     krebs.dns.providers = mkOption {
       type = types.attrsOf types.str;
     };
-
     krebs.dns.search-domain = mkOption {
       type = types.nullOr types.hostname;
     };
   };
+  config = mkIf config.krebs.enable {
+    krebs.dns.providers = {
+      "krebsco.de" = "zones";
+      shack = "hosts";
+      i = "hosts";
+      r = "hosts";
+      w = "hosts";
+    };
+    krebs.dns.search-domain = mkDefault "r";
+  };
 }
diff --git a/krebs/3modules/hosts.nix b/krebs/3modules/hosts.nix
index ae0136303..bd1bb1652 100644
--- a/krebs/3modules/hosts.nix
+++ b/krebs/3modules/hosts.nix
@@ -11,7 +11,7 @@ in {
     };
   };
 
-  config = {
+  config = mkIf config.krebs.enable {
     networking.hosts =
       filterAttrs
         (_name: value: value != [])
diff --git a/krebs/3modules/sitemap.nix b/krebs/3modules/sitemap.nix
new file mode 100644
index 000000000..ec2179db1
--- /dev/null
+++ b/krebs/3modules/sitemap.nix
@@ -0,0 +1,8 @@
+let
+  lib = import ../../lib;
+in {
+  options.krebs.sitemap = lib.mkOption {
+    type = with lib.types; attrsOf sitemap.entry;
+    default = {};
+  };
+}
diff --git a/krebs/3modules/users.nix b/krebs/3modules/users.nix
new file mode 100644
index 000000000..c1ad4b44b
--- /dev/null
+++ b/krebs/3modules/users.nix
@@ -0,0 +1,20 @@
+{ config, ... }: let
+  lib = import ../../lib;
+in {
+  options.krebs.users = lib.mkOption {
+    type = with lib.types; attrsOf user;
+  };
+  config = lib.mkIf config.krebs.enable {
+    krebs.users = {
+      krebs = {
+        home = "/krebs";
+        mail = "spam@krebsco.de";
+      };
+      root = {
+        home = "/root";
+        pubkey = config.krebs.build.host.ssh.pubkey;
+        uid = 0;
+      };
+    };
+  };
+}