From c61d99ccc653c9bee950c9e2d8a3f5bf6f4d8d1c Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 19 Aug 2020 02:26:27 +0200
Subject: tv: privatize gg23

---
 krebs/3modules/default.nix    |  1 -
 krebs/3modules/tv/default.nix | 37 -----------------------
 tv/2configs/default.nix       |  1 +
 tv/2configs/nets/gg23.nix     | 69 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 38 deletions(-)
 create mode 100644 tv/2configs/nets/gg23.nix

diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index ccc3a44b..9e4146ff 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -108,7 +108,6 @@ let
     {
       krebs.dns.providers = {
         "krebsco.de" = "zones";
-        gg23 = "hosts";
         shack = "hosts";
         i = "hosts";
         r = "hosts";
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index a20801b1..c2bf406f 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -131,11 +131,6 @@ in {
       ci = true;
       cores = 2;
       nets = {
-        gg23 = {
-          ip4.addr = "10.23.1.110";
-          aliases = ["nomic.gg23"];
-          ssh.port = 11423;
-        };
         retiolum = {
           ip4.addr = "10.243.0.110";
           aliases = [
@@ -158,27 +153,10 @@ in {
       ssh.privkey.path = <secrets/ssh.id_ed25519>;
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMIHmwXHV7E9UGuk4voVCADjlLkyygqNw054jvrsPn5t root@nomic";
     };
-    ok = {
-      external = true;
-      nets = {
-        gg23 = {
-          ip4.addr = "10.23.1.1";
-          aliases = ["ok.gg23"];
-        };
-      };
-    };
     wu = {
       ci = true;
       cores = 4;
       nets = {
-        gg23 = {
-          ip4.addr = "10.23.1.37";
-          aliases = [
-            "wu.gg23"
-            "cache.wu.gg23"
-          ];
-          ssh.port = 11423;
-        };
         retiolum = {
           ip4.addr = "10.243.13.37";
           aliases = [
@@ -237,14 +215,6 @@ in {
       ci = true;
       cores = 4;
       nets = {
-        gg23 = {
-          ip4.addr = "10.23.1.38";
-          aliases = [
-            "xu.gg23"
-            "cache.xu.gg23"
-          ];
-          ssh.port = 11423;
-        };
         retiolum = {
           ip4.addr = "10.243.13.38";
           aliases = [
@@ -272,13 +242,6 @@ in {
       ci = true;
       cores = 4;
       nets = {
-        gg23 = {
-          ip4.addr = "10.23.1.39";
-          aliases = [
-            "zu.gg23"
-          ];
-          ssh.port = 11423;
-        };
         retiolum = {
           ip4.addr = "10.243.13.40";
           aliases = [
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 4d27b0ea..01f83482 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -16,6 +16,7 @@ with import <stockholm/lib>;
     ./backup.nix
     ./bash
     ./htop.nix
+    ./nets/gg23.nix
     ./nginx
     ./pki
     ./ssh.nix
diff --git a/tv/2configs/nets/gg23.nix b/tv/2configs/nets/gg23.nix
new file mode 100644
index 00000000..fc5d239d
--- /dev/null
+++ b/tv/2configs/nets/gg23.nix
@@ -0,0 +1,69 @@
+{
+  krebs = {
+    dns.providers.gg23 = "hosts";
+    hosts = {
+      nomic = {
+        nets.gg23 = {
+          ip4 = {
+            addr = "10.23.1.110";
+            prefix = "10.23.1.0/24";
+          };
+          aliases = [
+            "nomic.gg23"
+          ];
+          ssh.port = 11423;
+        };
+      };
+      ok = {
+        external = true;
+        nets.gg23 = {
+          ip4 = {
+            addr = "10.23.1.1";
+            prefix = "10.23.1.0/24";
+          };
+          aliases = [
+            "ok.gg23"
+          ];
+        };
+      };
+      wu = {
+        nets.gg23 = {
+          ip4 = {
+            addr = "10.23.1.37";
+            prefix = "10.23.1.0/24";
+          };
+          aliases = [
+            "wu.gg23"
+            "cache.wu.gg23"
+          ];
+          ssh.port = 11423;
+        };
+      };
+      xu = {
+        nets.gg23 = {
+          ip4 = {
+            addr = "10.23.1.38";
+            prefix = "10.23.1.0/24";
+          };
+          aliases = [
+            "xu.gg23"
+            "cache.xu.gg23"
+          ];
+          ssh.port = 11423;
+        };
+      };
+      zu = {
+        nets.gg23 = {
+          ip4 = {
+            addr = "10.23.1.39";
+            prefix = "10.23.1.0/24";
+          };
+          aliases = [
+            "zu.gg23"
+          ];
+          ssh.port = 11423;
+        };
+      };
+    };
+  };
+}
-- 
cgit v1.2.3