From 358633f9737c8327d6028ebfadf72cbb51df70fb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 19 Aug 2020 02:30:51 +0200
Subject: tv nets: gg23 -> hkw

---
 tv/2configs/binary-cache/default.nix |  2 +-
 tv/2configs/default.nix              |  2 +-
 tv/2configs/nets/gg23.nix            | 69 ------------------------------------
 tv/2configs/nets/hkw.nix             | 69 ++++++++++++++++++++++++++++++++++++
 tv/2configs/nginx/public_html.nix    |  2 +-
 5 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100644 tv/2configs/nets/gg23.nix
 create mode 100644 tv/2configs/nets/hkw.nix

(limited to 'tv')

diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
index 866434cb5..f6eaba36f 100644
--- a/tv/2configs/binary-cache/default.nix
+++ b/tv/2configs/binary-cache/default.nix
@@ -27,7 +27,7 @@
     enable = true;
     virtualHosts.nix-serve = {
       serverAliases = [
-        "cache.${config.krebs.build.host.name}.gg23"
+        "cache.${config.krebs.build.host.name}.hkw"
       ];
       locations."/".extraConfig = ''
         proxy_pass http://localhost:${toString config.services.nix-serve.port};
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 01f83482e..9db35184a 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -16,7 +16,7 @@ with import <stockholm/lib>;
     ./backup.nix
     ./bash
     ./htop.nix
-    ./nets/gg23.nix
+    ./nets/hkw.nix
     ./nginx
     ./pki
     ./ssh.nix
diff --git a/tv/2configs/nets/gg23.nix b/tv/2configs/nets/gg23.nix
deleted file mode 100644
index fc5d239d5..000000000
--- a/tv/2configs/nets/gg23.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  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;
-        };
-      };
-    };
-  };
-}
diff --git a/tv/2configs/nets/hkw.nix b/tv/2configs/nets/hkw.nix
new file mode 100644
index 000000000..725e63b13
--- /dev/null
+++ b/tv/2configs/nets/hkw.nix
@@ -0,0 +1,69 @@
+{
+  krebs = {
+    dns.providers.hkw = "hosts";
+    hosts = {
+      nomic = {
+        nets.hkw = {
+          ip4 = {
+            addr = "10.23.1.110";
+            prefix = "10.23.1.0/24";
+          };
+          aliases = [
+            "nomic.hkw"
+          ];
+          ssh.port = 11423;
+        };
+      };
+      ok = {
+        external = true;
+        nets.hkw = {
+          ip4 = {
+            addr = "10.23.1.1";
+            prefix = "10.23.1.0/24";
+          };
+          aliases = [
+            "ok.hkw"
+          ];
+        };
+      };
+      wu = {
+        nets.hkw = {
+          ip4 = {
+            addr = "10.23.1.37";
+            prefix = "10.23.1.0/24";
+          };
+          aliases = [
+            "wu.hkw"
+            "cache.wu.hkw"
+          ];
+          ssh.port = 11423;
+        };
+      };
+      xu = {
+        nets.hkw = {
+          ip4 = {
+            addr = "10.23.1.38";
+            prefix = "10.23.1.0/24";
+          };
+          aliases = [
+            "xu.hkw"
+            "cache.xu.hkw"
+          ];
+          ssh.port = 11423;
+        };
+      };
+      zu = {
+        nets.hkw = {
+          ip4 = {
+            addr = "10.23.1.39";
+            prefix = "10.23.1.0/24";
+          };
+          aliases = [
+            "zu.hkw"
+          ];
+          ssh.port = 11423;
+        };
+      };
+    };
+  };
+}
diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix
index cc7a39891..a37498ba3 100644
--- a/tv/2configs/nginx/public_html.nix
+++ b/tv/2configs/nginx/public_html.nix
@@ -9,7 +9,7 @@ with import <stockholm/lib>;
       serverAliases = [
         "localhost"
         "${config.krebs.build.host.name}"
-        "${config.krebs.build.host.name}.gg23"
+        "${config.krebs.build.host.name}.hkw"
         "${config.krebs.build.host.name}.r"
       ];
       locations."~ ^/~(.+?)(/.*)?\$".extraConfig = ''
-- 
cgit v1.2.3