kartei tv ni: RIPHEADmaster

3 files changed, 20 insertions, 74 deletions

diff --git a/kartei/tv/hosts/ne.nix b/kartei/tv/hosts/ne.nix
index 584d7c433..1191fcb71 100644
--- a/kartei/tv/hosts/ne.nix
+++ b/kartei/tv/hosts/ne.nix
@@ -2,8 +2,13 @@
   extraZones = {
     "krebsco.de" = ''
       @ 60 IN MX 5 ne
+      @ 60 IN TXT "v=spf1 mx -all"
       ne 60 IN A ${config.krebs.hosts.ne.nets.internet.ip4.addr}
       ne 60 IN AAAA ${config.krebs.hosts.ne.nets.internet.ip6.addr}
+      cgit 60 IN A ${config.krebs.hosts.ne.nets.internet.ip4.addr}
+      cgit 60 IN AAAA ${config.krebs.hosts.ne.nets.internet.ip6.addr}
+      cgit.ne 60 IN A ${config.krebs.hosts.ne.nets.internet.ip4.addr}
+      search.ne 60 IN AAAA ${config.krebs.hosts.ne.nets.internet.ip6.addr}
       tv 300 IN NS ne
     '';
   };
@@ -11,6 +16,7 @@
     internet = {
       aliases = [
         "ne.i"
+        "cgit.ne.i"
       ];
       ip4 = {
         addr = "159.195.31.38";
@@ -26,14 +32,26 @@
         "ne.m"
       ];
       ip6.addr = "45f:fa21:4bdd:a758:8091:947d:fe84:fac3";
+      via = config.krebs.hosts.ne.nets.internet;
     };
     retiolum = {
       aliases = [
         "ne.r"
+        "cgit.ne.r"
+        "krebs.ne.r"
+        "search.ne.r"
+        "p.ne.r"
+        "p.tv.r"
       ];
+      ip4.addr = "10.243.113.224";
+      via = config.krebs.hosts.ne.nets.internet;
     };
     wiregrill = {
       ip4.addr = "10.244.3.2";
+      via = config.krebs.hosts.ne.nets.internet;
+      wireguard.subnets = [
+        (slib.krebs.genipv6 "wiregrill" "tv" 0).subnetCIDR
+      ];
     };
   };
 }
diff --git a/kartei/tv/hosts/ni.nix b/kartei/tv/hosts/ni.nix
deleted file mode 100644
index 3e3d81c37..000000000
--- a/kartei/tv/hosts/ni.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ config, lib, slib, ... }: {
-  extraZones = {
-    "krebsco.de" = ''
-      ni          60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
-      ni          60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr}
-      cgit        60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
-      cgit        60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr}
-      cgit.ni     60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
-      cgit.ni     60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr}
-      search.ni   60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr}
-      search.ni   60 IN AAAA ${config.krebs.hosts.ni.nets.internet.ip6.addr}
-      krebsco.de. 60 IN MX 5 ni
-      krebsco.de. 60 IN TXT "v=spf1 mx -all"
-      tv          300 IN NS ni
-    '';
-  };
-  nets = {
-    internet = {
-      ip4 = {
-        addr = "185.162.251.237";
-      };
-      ip6 = {
-        addr = "2a03:4000:1a:cf::1";
-        prefixLength = 64;
-      };
-      aliases = [
-        "ni.i"
-        "cgit.ni.i"
-      ];
-      ssh.port = 11423;
-    };
-    retiolum = {
-      via = config.krebs.hosts.ni.nets.internet;
-      ip4.addr = "10.243.113.223";
-      aliases = [
-        "ni.r"
-        "cgit.ni.r"
-        "krebs.ni.r"
-        "search.ni.r"
-      ];
-      tinc.pubkey = ''
-        -----BEGIN RSA PUBLIC KEY-----
-        MIICCgKCAgEA7NHuW8eLVhpBfL70WwcSGVmv4dijKLJs5cH/BmqK8zN2lpiLKt12
-        bhaE1YEhGoGma7Kef1Fa0V9xUkJy6C1+sVlfWp/LeY8VRSX5E3u36TEl6kl/4zu6
-        Ea/44BoGUSOC9ImxVEX51czA10PFjUSrGFyK0oaRlKNsTwwpNiBOY7/6i74bhn59
-        OIsySRUBd2QPjYhJkiuc7gltVfwt6wteZh8R4w2rluVGYLQPsmN/XEWgJbhzI4im
-        W+3/bdewHVF1soZWtdocPLeXTn5HETX5g8p2V3bwYL37oIwkCcYxOeQtT7W+lNJ2
-        NvIiVh4Phojl4dBUgUQGT0NApMnsaG/4LJpSC4AGiqbsznBdSPhepob7zJggPnWY
-        nfAs+YrUUZp1wovhSgWfYTRglRuyYvWkoGbq411H1efawyZ0gcMr+HQlSn2keQOv
-        lbcvdgOAxQiEcPVixPq3mTeKaSxWyIJGFceuqtnILGifRNvViX0uo9g5rLQ41PrJ
-        9F3azz3gD2Uh73j5pvLU72cge7p1a7epPYWTJYf8oc5JcI3nYTKpSqH8IYaWUjv9
-        q0NwOYFDhYtUcTwdbUNl/tUWKyBcovIe7f40723pHSijiPV2WDZC2M/mOc3dvWKF
-        Mf00uin+7uMuKtnG6+1z5nKb/AWrqN1RZu0rnG/IkZPKwa19HYsYcOkCAwEAAQ==
-        -----END RSA PUBLIC KEY-----
-      '';
-      tinc.pubkey_ed25519 = "nDuK96NlNhcxzlX7G30w/706RxItb+FhkFkz/VhUgCE";
-    };
-    wiregrill = {
-      via = config.krebs.hosts.ni.nets.internet;
-      ip4.addr = "10.244.3.1";
-      wireguard.subnets = [
-        (slib.krebs.genipv6 "wiregrill" "tv" 0).subnetCIDR
-      ];
-    };
-  };
-  ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILGDdcKwFm6udU0/x6XGGb87k9py0VlrxF54HeYu9Izb";
-}
diff --git a/krebs/2configs/nameserver.nix b/krebs/2configs/nameserver.nix
index c394f312d..c61b5c1b1 100644
--- a/krebs/2configs/nameserver.nix
+++ b/krebs/2configs/nameserver.nix
@@ -70,10 +70,6 @@ in {
           address: ${config.krebs.hosts.ne.nets.internet.ip4.addr}
           key: krebs_transfer_notify_key
 
-        - id: krebscode_ni
-          address: ${config.krebs.hosts.ni.nets.internet.ip4.addr}
-          key: krebs_transfer_notify_key
-
       acl:
         - id: acme_acl
           key: acme
@@ -124,7 +120,6 @@ in {
           notify: henet_ns1
           notify: hostingde_ns1
           notify: krebscode_ne
-          notify: krebscode_ni
           acl: transfer_to_henet_secondary
           acl: transfer_to_hostingde_secondary
           acl: transfer_to_krebscode_secondary
@@ -174,8 +169,8 @@ in {
           echo server krebsco.de.
           echo zone krebsco.de.
           echo origin krebsco.de.
-          echo add _25._tcp.ni 60 IN TLSA 3 0 1 $certificate_association_data
-          echo add _443._tcp.ni 60 IN TLSA 3 0 1 $certificate_association_data
+          echo add _25._tcp.ne 60 IN TLSA 3 0 1 $certificate_association_data
+          echo add _443._tcp.ne 60 IN TLSA 3 0 1 $certificate_association_data
           echo show
           echo send
           echo answer