1 files changed, 27 insertions, 7 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index b38c9104..f9e8d485 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -143,11 +143,19 @@ in {
       ci = true;
       cores = 4;
       nets = {
+        lan = {
+          ip4.addr = "192.168.8.11";
+          aliases = [
+            "wbob.lan"
+            "log.wbob.lan"
+          ];
+        };
         retiolum = {
           ip4.addr = "10.243.214.15";
           aliases = [
             "wbob.r"
             "hydra.wbob.r"
+            "log.wbob.r"
           ];
         };
       };
@@ -176,12 +184,14 @@ in {
           nixos.unstable    IN CNAME  krebscode.github.io.
           o.euer            IN A      ${nets.internet.ip4.addr}
           photostore        IN A      ${nets.internet.ip4.addr}
-          pigstarter        IN A      ${nets.internet.ip4.addr}
+          pigstarter        IN CNAME  makefu.github.io.
           share.euer        IN A      ${nets.internet.ip4.addr}
           wg.euer           IN A      ${nets.internet.ip4.addr}
           wiki.euer         IN A      ${nets.internet.ip4.addr}
           wikisearch        IN A      ${nets.internet.ip4.addr}
+          bookmark.euer     IN A      ${nets.internet.ip4.addr}
           io                IN NS     gum.krebsco.de.
+          mediengewitter    IN CNAME  over.dose.io.
         '';
       };
       cores = 8;
@@ -196,13 +206,13 @@ in {
         };
         wiregrill = {
           via = internet;
+          ip4.addr = "10.244.245.1";
           ip6.addr = w6 "1";
-          wireguard = {
-            subnets = [
-              (krebs.genipv6 "wiregrill" "external" 0).subnetCIDR
+          wireguard.port = 51821;
+          wireguard.subnets = [
               (krebs.genipv6 "wiregrill" "makefu" 0).subnetCIDR
-            ];
-          };
+              "10.244.245.0/24" # required for routing directly to gum via rockit
+          ];
         };
         retiolum = {
           via = internet;
@@ -227,6 +237,7 @@ in {
             "tracker.makefu.r"
             "wiki.gum.r"
             "wiki.makefu.r"
+            "sick.makefu.r"
           ];
         };
       };
@@ -247,7 +258,6 @@ in {
       cores = 1;
       extraZones = {
         "krebsco.de" = ''
-          mediengewitter    IN A      ${nets.internet.ip4.addr}
           flap              IN A      ${nets.internet.ip4.addr}
         '';
       };
@@ -280,6 +290,16 @@ in {
           ip4.addr = "10.243.189.130";
         };
       };
+          };
+
+    shackdev = rec { # router@shack
+      cores = 1;
+      nets.wiregrill.ip4.addr = "10.244.245.2";
+    };
+
+    rockit = rec { # router@home
+      cores = 1;
+      nets.wiregrill.ip4.addr = "10.244.245.3";
     };
 
     senderechner = rec {