From df0bca25bb4e58f7cf13dab8069a346f7c330411 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 16 Sep 2021 19:16:21 +0200
Subject: [PATCH] switch domainNames from zentralwerk.dn42 to zentralwerk.org

---
 nix/lib/dns.nix           |  4 +-
 salt-pillar/dhcp/init.sls | 86 +++++++++++++++++++--------------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/nix/lib/dns.nix b/nix/lib/dns.nix
index 20a31ec..f485f5c 100644
--- a/nix/lib/dns.nix
+++ b/nix/lib/dns.nix
@@ -179,15 +179,15 @@ rec {
             name = "${net}.zentralwerk.dn42";
             ns = internalNS;
             records =
-              hosts4Records hosts4 ++
               lib.optionals (hosts6 ? dn42) (hosts6Records hosts6.dn42);
-            dynamic = dynamicDomain;
           }
           {
             name = "${net}.zentralwerk.org";
             ns = publicNS;
             records =
+              hosts4Records hosts4 ++
               lib.optionals (hosts6 ? up4) (hosts6Records hosts6.up4);
+            dynamic = dynamicDomain;
           }
         ]) namedNets
       )
diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls
index 3fd0777..c2c90a0 100644
--- a/salt-pillar/dhcp/init.sls
+++ b/salt-pillar/dhcp/init.sls
@@ -10,7 +10,7 @@ dhcp:
     host-opts:
       routers: pub-gw.pub
     string-opts:
-      domain-name: pub.zentralwerk.dn42
+      domain-name: pub.zentralwerk.org
 
   priv1:
     start: 172.20.74.2
@@ -22,7 +22,7 @@ dhcp:
     host-opts:
       routers: priv1-gw.priv1
     string-opts:
-      domain-name: priv1.zentralwerk.dn42
+      domain-name: priv1.zentralwerk.org
 
   priv2:
     start: 172.20.75.2
@@ -34,7 +34,7 @@ dhcp:
     host-opts:
       routers: priv2-gw.priv2
     string-opts:
-      domain-name: priv2.zentralwerk.dn42
+      domain-name: priv2.zentralwerk.org
     fixed-hosts:
       172.20.75.7: 60:33:4b:0b:cd:fc
       172.20.75.9: 00:11:32:22:95:79
@@ -49,7 +49,7 @@ dhcp:
     host-opts:
       routers: priv3-gw.priv3
     string-opts:
-      domain-name: priv3.zentralwerk.dn42
+      domain-name: priv3.zentralwerk.org
 
   priv4:
     start: 172.20.75.130
@@ -61,7 +61,7 @@ dhcp:
     host-opts:
       routers: priv4-gw.priv4
     string-opts:
-      domain-name: priv4.zentralwerk.dn42
+      domain-name: priv4.zentralwerk.org
 
   priv5:
     start: 172.20.74.66
@@ -73,7 +73,7 @@ dhcp:
     host-opts:
       routers: priv5-gw.priv5
     string-opts:
-      domain-name: priv5.zentralwerk.dn42
+      domain-name: priv5.zentralwerk.org
 
   priv6:
     start: 172.20.74.194
@@ -85,7 +85,7 @@ dhcp:
     host-opts:
       routers: priv6-gw.priv6
     string-opts:
-      domain-name: priv6.zentralwerk.dn42
+      domain-name: priv6.zentralwerk.org
 
   priv7:
     start: 172.20.75.66
@@ -97,7 +97,7 @@ dhcp:
     host-opts:
       routers: priv7-gw.priv7
     string-opts:
-      domain-name: priv7.zentralwerk.dn42
+      domain-name: priv7.zentralwerk.org
 
   priv8:
     start: 172.20.75.194
@@ -109,7 +109,7 @@ dhcp:
     host-opts:
       routers: priv8-gw.priv8
     string-opts:
-      domain-name: priv8.zentralwerk.dn42
+      domain-name: priv8.zentralwerk.org
 
   priv9:
     start: 172.20.74.34
@@ -121,7 +121,7 @@ dhcp:
     host-opts:
       routers: priv9-gw.priv9
     string-opts:
-      domain-name: priv9.zentralwerk.dn42
+      domain-name: priv9.zentralwerk.org
 
   priv10:
     start: 172.20.74.98
@@ -133,7 +133,7 @@ dhcp:
     host-opts:
       routers: priv10-gw.priv10
     string-opts:
-      domain-name: priv10.zentralwerk.dn42
+      domain-name: priv10.zentralwerk.org
 
   priv11:
     start: 172.20.74.162
@@ -145,7 +145,7 @@ dhcp:
     host-opts:
       routers: priv11-gw.priv11
     string-opts:
-      domain-name: priv11.zentralwerk.dn42
+      domain-name: priv11.zentralwerk.org
 
   priv12:
     start: 172.20.74.226
@@ -157,7 +157,7 @@ dhcp:
     host-opts:
       routers: priv12-gw.priv12
     string-opts:
-      domain-name: priv12.zentralwerk.dn42
+      domain-name: priv12.zentralwerk.org
 
   priv13:
     start: 172.20.75.34
@@ -169,7 +169,7 @@ dhcp:
     host-opts:
       routers: priv13-gw.priv13
     string-opts:
-      domain-name: priv13.zentralwerk.dn42
+      domain-name: priv13.zentralwerk.org
 
   priv14:
     start: 172.20.75.98
@@ -181,7 +181,7 @@ dhcp:
     host-opts:
       routers: priv14-gw.priv14
     string-opts:
-      domain-name: priv14.zentralwerk.dn42
+      domain-name: priv14.zentralwerk.org
 
   priv15:
     start: 172.20.75.162
@@ -193,7 +193,7 @@ dhcp:
     host-opts:
       routers: priv15-gw.priv15
     string-opts:
-      domain-name: priv15.zentralwerk.dn42
+      domain-name: priv15.zentralwerk.org
 
   priv16:
     start: 172.20.75.226
@@ -205,7 +205,7 @@ dhcp:
     host-opts:
       routers: priv16-gw.priv16
     string-opts:
-      domain-name: priv16.zentralwerk.dn42
+      domain-name: priv16.zentralwerk.org
 
   priv17:
     start: 172.20.73.131
@@ -217,7 +217,7 @@ dhcp:
     host-opts:
       routers: priv17-gw.priv17
     string-opts:
-      domain-name: priv17.zentralwerk.dn42
+      domain-name: priv17.zentralwerk.org
 
   priv18:
     start: 172.20.74.50
@@ -229,7 +229,7 @@ dhcp:
     host-opts:
       routers: priv18-gw.priv18
     string-opts:
-      domain-name: priv18.zentralwerk.dn42
+      domain-name: priv18.zentralwerk.org
 
   priv19:
     start: 172.20.73.194
@@ -242,7 +242,7 @@ dhcp:
     host-opts:
       routers: priv19-gw.priv19
     string-opts:
-      domain-name: priv19.zentralwerk.dn42
+      domain-name: priv19.zentralwerk.org
 
   priv20:
     start: 172.20.74.114
@@ -254,7 +254,7 @@ dhcp:
     host-opts:
       routers: priv20-gw.priv20
     string-opts:
-      domain-name: priv20.zentralwerk.dn42
+      domain-name: priv20.zentralwerk.org
 
   priv21:
     start: 172.20.74.146
@@ -266,7 +266,7 @@ dhcp:
     host-opts:
       routers: priv21-gw.priv21
     string-opts:
-      domain-name: priv21.zentralwerk.dn42
+      domain-name: priv21.zentralwerk.org
 
   priv22:
     start: 172.20.74.178
@@ -278,7 +278,7 @@ dhcp:
     host-opts:
       routers: priv22-gw.priv22
     string-opts:
-      domain-name: priv22.zentralwerk.dn42
+      domain-name: priv22.zentralwerk.org
 
   priv23:
     start: 172.20.73.165
@@ -290,7 +290,7 @@ dhcp:
     host-opts:
       routers: priv23-gw.priv23
     string-opts:
-      domain-name: priv23.zentralwerk.dn42
+      domain-name: priv23.zentralwerk.org
     fixed-hosts:
       172.20.73.162: da:2c:3a:2c:87:22
       172.20.73.163: ca:9f:27:b2:bf:6d
@@ -306,7 +306,7 @@ dhcp:
     host-opts:
       routers: priv24-gw.priv24
     string-opts:
-      domain-name: priv24.zentralwerk.dn42
+      domain-name: priv24.zentralwerk.org
 
   priv25:
     start: 172.20.74.82
@@ -318,7 +318,7 @@ dhcp:
     host-opts:
       routers: priv25-gw.priv25
     string-opts:
-      domain-name: priv25.zentralwerk.dn42
+      domain-name: priv25.zentralwerk.org
 
   priv26:
     start: 172.20.75.50
@@ -330,7 +330,7 @@ dhcp:
     host-opts:
       routers: priv26-gw.priv26
     string-opts:
-      domain-name: priv26.zentralwerk.dn42
+      domain-name: priv26.zentralwerk.org
 
   priv27:
     start: 172.20.75.82
@@ -342,7 +342,7 @@ dhcp:
     host-opts:
       routers: priv27-gw.priv27
     string-opts:
-      domain-name: priv27.zentralwerk.dn42
+      domain-name: priv27.zentralwerk.org
 
   priv28:
     start: 172.20.75.114
@@ -354,7 +354,7 @@ dhcp:
     host-opts:
       routers: priv28-gw.priv28
     string-opts:
-      domain-name: priv28.zentralwerk.dn42
+      domain-name: priv28.zentralwerk.org
 
   priv29:
     start: 172.20.75.146
@@ -366,7 +366,7 @@ dhcp:
     host-opts:
       routers: priv29-gw.priv29
     string-opts:
-      domain-name: priv29.zentralwerk.dn42
+      domain-name: priv29.zentralwerk.org
 
   priv30:
     start: 172.20.75.178
@@ -378,7 +378,7 @@ dhcp:
     host-opts:
       routers: priv30-gw.priv30
     string-opts:
-      domain-name: priv30.zentralwerk.dn42
+      domain-name: priv30.zentralwerk.org
 
   priv31:
     start: 172.20.75.210
@@ -390,7 +390,7 @@ dhcp:
     host-opts:
       routers: priv31-gw.priv31
     string-opts:
-      domain-name: priv31.zentralwerk.dn42
+      domain-name: priv31.zentralwerk.org
 
   priv32:
     start: 172.20.75.242
@@ -402,7 +402,7 @@ dhcp:
     host-opts:
       routers: priv32-gw.priv32
     string-opts:
-      domain-name: priv32.zentralwerk.dn42
+      domain-name: priv32.zentralwerk.org
 
   priv33:
     start: 172.20.74.18
@@ -414,7 +414,7 @@ dhcp:
     host-opts:
       routers: priv33-gw.priv33
     string-opts:
-      domain-name: priv33.zentralwerk.dn42
+      domain-name: priv33.zentralwerk.org
 
   priv34:
     start: 172.20.74.210
@@ -426,7 +426,7 @@ dhcp:
     host-opts:
       routers: priv34-gw.priv34
     string-opts:
-      domain-name: priv34.zentralwerk.dn42
+      domain-name: priv34.zentralwerk.org
 
   priv35:
     start: 172.20.76.2
@@ -438,7 +438,7 @@ dhcp:
     host-opts:
       routers: priv35-gw.priv35
     string-opts:
-      domain-name: priv35.zentralwerk.dn42
+      domain-name: priv35.zentralwerk.org
 
   priv36:
     start: 172.20.76.66
@@ -450,7 +450,7 @@ dhcp:
     host-opts:
       routers: priv36-gw.priv36
     string-opts:
-      domain-name: priv36.zentralwerk.dn42
+      domain-name: priv36.zentralwerk.org
 
   priv37:
     start: 172.20.76.130
@@ -462,7 +462,7 @@ dhcp:
     host-opts:
       routers: priv37-gw.priv37
     string-opts:
-      domain-name: priv37.zentralwerk.dn42
+      domain-name: priv37.zentralwerk.org
 
   priv38:
     start: 172.20.76.194
@@ -474,7 +474,7 @@ dhcp:
     host-opts:
       routers: priv38-gw.priv38
     string-opts:
-      domain-name: priv38.zentralwerk.dn42
+      domain-name: priv38.zentralwerk.org
 
   priv39:
     start: 172.20.77.130
@@ -486,7 +486,7 @@ dhcp:
     host-opts:
       routers: priv39-gw.priv39
     string-opts:
-      domain-name: priv39.zentralwerk.dn42
+      domain-name: priv39.zentralwerk.org
 
   priv40:
     start: 172.20.77.66
@@ -498,7 +498,7 @@ dhcp:
     host-opts:
       routers: priv40-gw.priv40
     string-opts:
-      domain-name: priv40.zentralwerk.dn42
+      domain-name: priv40.zentralwerk.org
 
   priv41:
     start: 172.20.77.194
@@ -510,7 +510,7 @@ dhcp:
     host-opts:
       routers: priv41-gw.priv41
     string-opts:
-      domain-name: priv41.zentralwerk.dn42
+      domain-name: priv41.zentralwerk.org
 
   priv42:
     start: 172.20.76.34
@@ -522,4 +522,4 @@ dhcp:
     host-opts:
       routers: priv42-gw.priv42
     string-opts:
-      domain-name: priv42.zentralwerk.dn42
+      domain-name: priv42.zentralwerk.org