From 6f26a01e0a849e30b71f1f4646774cf244b79ce2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 15 Feb 2022 22:29:33 +0100
Subject: k 3 ma: init latte

---
 krebs/3modules/makefu/default.nix | 40 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

(limited to 'krebs/3modules/makefu/default.nix')

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index f87802b45..1695db3f5 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -148,6 +148,44 @@ in {
         };
       };
     };
+    latte = rec {
+      ci = true;
+      extraZones = {
+        "krebsco.de" = ''
+          latte.euer     IN A      ${nets.internet.ip4.addr}
+        '';
+      };
+      cores = 4;
+      nets = rec {
+        internet = {
+          ip4.addr = "178.254.30.202";
+          ip6.addr = "2a00:6800:3:18c::2";
+          aliases = [
+            "latte.i"
+          ];
+        };
+        #wiregrill = {
+        #  via = internet;
+        #  ip4.addr = "10.244.245.1";
+        #  ip6.addr = w6 "1";
+        #  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;
+          ip4.addr = "10.243.0.214";
+          # never connect via gum (he eats your packets!)
+          #tinc.weight = 9001;
+
+          aliases = [
+            "latte.r"
+          ];
+        };
+      };
+    };
     gum = rec {
       ci = true;
       extraZones = {
@@ -220,7 +258,7 @@ in {
           via = internet;
           ip4.addr = "10.243.0.213";
           # never connect via gum (he eats your packets!)
-          tinc.weight = 9001;
+          #tinc.weight = 9001;
 
           aliases = [
             "gum.r"
-- 
cgit v1.2.3


From d085a1b0b47092a3eaf728c5e8cc978169e158e1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Feb 2022 21:47:38 +0100
Subject: k 3 ma: torrent.latte.r

---
 krebs/3modules/makefu/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs/3modules/makefu/default.nix')

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 1695db3f5..7a3d2fcc2 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -182,6 +182,7 @@ in {
 
           aliases = [
             "latte.r"
+            "torrent.latte.r"
           ];
         };
       };
-- 
cgit v1.2.3


From 123221de60a626ccf42c4ee5049bf385597c1bb3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 28 Feb 2022 21:44:27 +0100
Subject: ma rss.euer: gum -> latte

---
 krebs/3modules/makefu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules/makefu/default.nix')

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 7a3d2fcc2..68484a102 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -153,6 +153,7 @@ in {
       extraZones = {
         "krebsco.de" = ''
           latte.euer     IN A      ${nets.internet.ip4.addr}
+          rss.euer          IN A      ${nets.internet.ip4.addr}
         '';
       };
       cores = 4;
@@ -212,7 +213,6 @@ in {
           feed.euer         IN A      ${nets.internet.ip4.addr}
           board.euer        IN A      ${nets.internet.ip4.addr}
           etherpad.euer     IN A      ${nets.internet.ip4.addr}
-          rss.euer          IN A      ${nets.internet.ip4.addr}
           mediengewitter    IN CNAME  over.dose.io.
           mon.euer          IN A      ${nets.internet.ip4.addr}
           netdata.euer      IN A      ${nets.internet.ip4.addr}
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/e8100000.lock: No such file or directory (2)