Merge remote-tracking branch 'cd/master'

4 files changed, 36 insertions, 29 deletions

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index d309c1714..ccf21c868 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -323,7 +323,7 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB
           cgit.euer         IN A      ${head nets.internet.addrs4}
         '';
       };
-      nets = {
+      nets = rec {
         internet = {
           addrs4 = ["195.154.108.70"];
           aliases = [
@@ -331,6 +331,7 @@ TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB
           ];
         };
         retiolum = {
+          via = internet;
           addrs4 = ["10.243.0.211"];
           addrs6 = ["42:f9f0:0000:0000:0000:0000:0000:70d2"];
           aliases = [
diff --git a/krebs/3modules/nginx.nix b/krebs/3modules/nginx.nix
index 7b7163071..ec39715d8 100644
--- a/krebs/3modules/nginx.nix
+++ b/krebs/3modules/nginx.nix
@@ -13,33 +13,34 @@ let
     enable = mkEnableOption "krebs.nginx";
 
     servers = mkOption {
-      type = with types; attrsOf optionSet;
-      options = singleton {
-        server-names = mkOption {
-          type = with types; listOf str;
-          # TODO use identity
-          default = [
-            "${config.networking.hostName}"
-            "${config.networking.hostName}.retiolum"
-          ];
+      type = types.attrsOf (types.submodule {
+        options = {
+          server-names = mkOption {
+            type = with types; listOf str;
+            # TODO use identity
+            default = [
+              "${config.networking.hostName}"
+              "${config.networking.hostName}.retiolum"
+            ];
+          };
+          listen = mkOption {
+            type = with types; either str (listOf str);
+            default = "80";
+            apply = x:
+              if typeOf x != "list"
+                then [x]
+                else x;
+          };
+          locations = mkOption {
+            type = with types; listOf (attrsOf str);
+            default = [];
+          };
+          extraConfig = mkOption {
+            type = with types; string;
+            default = "";
+          };
         };
-        listen = mkOption {
-          type = with types; either str (listOf str);
-          default = "80";
-          apply = x:
-            if typeOf x != "list"
-              then [x]
-              else x;
-        };
-        locations = mkOption {
-          type = with types; listOf (attrsOf str);
-          default = [];
-        };
-        extraConfig = mkOption {
-          type = with types; string;
-          default = "";
-        };
-      };
+      });
       default = {};
     };
   };
diff --git a/krebs/3modules/setuid.nix b/krebs/3modules/setuid.nix
index 1137788d8..cfb8382e8 100644
--- a/krebs/3modules/setuid.nix
+++ b/krebs/3modules/setuid.nix
@@ -46,6 +46,7 @@ let
             check = x:
               isString x &&
               match "[0-7][0-7][0-7][0-7]" x != null;
+            merge = mergeOneOption;
           };
         };
         activate = mkOption {
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 533502914..a0237d361 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -104,7 +104,7 @@ with config.krebs.lib;
           ire 60 IN A ${elemAt nets.internet.addrs4 0}
         '';
       };
-      nets = {
+      nets = rec {
         internet = {
           addrs4 = ["198.147.22.115"];
           aliases = [
@@ -115,6 +115,7 @@ with config.krebs.lib;
           ssh.port = 11423;
         };
         retiolum = {
+          via = internet;
           addrs4 = ["10.243.231.66"];
           addrs6 = ["42:b912:0f42:a82d:0d27:8610:e89b:490c"];
           aliases = [
@@ -286,7 +287,10 @@ with config.krebs.lib;
       nets = {
         gg23 = {
           addrs4 = ["10.23.1.37"];
-          aliases = ["wu.gg23"];
+          aliases = [
+            "wu.gg23"
+            "cache.wu.gg23"
+          ];
           ssh.port = 11423;
         };
         retiolum = {