Merge remote-tracking branch 'gum/master'

1 files changed, 15 insertions, 7 deletions

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index b38c9104f..dc9ade199 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"
           ];
         };
       };
@@ -182,6 +190,7 @@ in {
           wiki.euer         IN A      ${nets.internet.ip4.addr}
           wikisearch        IN A      ${nets.internet.ip4.addr}
           io                IN NS     gum.krebsco.de.
+          mediengewitter    IN CNAME  over.dose.io.
         '';
       };
       cores = 8;
@@ -196,13 +205,9 @@ in {
         };
         wiregrill = {
           via = internet;
+          ip4.addr = "10.245.0.1";
           ip6.addr = w6 "1";
-          wireguard = {
-            subnets = [
-              (krebs.genipv6 "wiregrill" "external" 0).subnetCIDR
-              (krebs.genipv6 "wiregrill" "makefu" 0).subnetCIDR
-            ];
-          };
+          wireguard.port = 51821;
         };
         retiolum = {
           via = internet;
@@ -247,7 +252,6 @@ in {
       cores = 1;
       extraZones = {
         "krebsco.de" = ''
-          mediengewitter    IN A      ${nets.internet.ip4.addr}
           flap              IN A      ${nets.internet.ip4.addr}
         '';
       };
@@ -281,6 +285,10 @@ in {
         };
       };
     };
+    rockit = rec { # router@home
+      cores = 1;
+      nets.wiregrill.ip4.addr = "10.245.0.2";
+    };
 
     senderechner = rec {
       cores = 2;