From a8c79a3dea4fea2f0935787beda48b0b2647e0bd Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 2 Jul 2019 18:46:12 +0200
Subject: [PATCH 1/3] switches: share vlan serv between switch-b1,b2

---
 salt-pillar/switches/init.sls | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 7b85ebb..b92f17f 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -18,6 +18,7 @@ switches:
           - GigabitEthernet 1/0/28
         vlans:
           - mgmt
+          - serv
           - pub
           - c3d2
           - radio
@@ -256,6 +257,7 @@ switches:
           - GigabitEthernet 1/0/28
         vlans:
           - mgmt
+          - serv
           - pub
           - c3d2
           - radio

From 244349bd403184732588f0772cf30c9ce7865122 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 2 Jul 2019 19:48:43 +0200
Subject: [PATCH 2/3] introduce dnscache.serv

---
 salt-pillar/bird/radv.sls  | 30 ++++++++++++++++++++++++
 salt-pillar/dhcp/init.sls  | 48 +++++++++++++++++++-------------------
 salt-pillar/hosts/init.sls |  5 +++-
 3 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/salt-pillar/bird/radv.sls b/salt-pillar/bird/radv.sls
index 2518508..8de7493 100644
--- a/salt-pillar/bird/radv.sls
+++ b/salt-pillar/bird/radv.sls
@@ -2,162 +2,192 @@ radv:
   pub-gw:
     pub:
       rdnss:
+        - dnscache.serv
         - upstream1.core
+        - upstream2.core
       dnssl:
         - pub.zentralwerk.org
   serv-gw:
     serv:
       rdnss:
+        - dnscache.serv
         - upstream1.core
+        - upstream2.core
       dnssl:
         - serv.zentralwerk.org
   c3d2-gw:
     c3d2:
       rdnss:
+        - dnscache.serv
         - upstream1.core
+        - upstream2.core
       dnssl:
         - hq.c3d2.de
   priv1-gw:
     priv1:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv1.zentralwerk.org
   priv2-gw:
     priv2:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv2.zentralwerk.org
   priv3-gw:
     priv3:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv3.zentralwerk.org
   priv4-gw:
     priv4:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv4.zentralwerk.org
   priv5-gw:
     priv5:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv5.zentralwerk.org
   priv6-gw:
     priv6:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv6.zentralwerk.org
   priv7-gw:
     priv7:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv7.zentralwerk.org
   priv8-gw:
     priv8:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv8.zentralwerk.org
   priv9-gw:
     priv9:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv9.zentralwerk.org
   priv10-gw:
     priv10:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv10.zentralwerk.org
   priv11-gw:
     priv11:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv11.zentralwerk.org
   priv12-gw:
     priv12:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv12.zentralwerk.org
   priv13-gw:
     priv13:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv13.zentralwerk.org
   priv14-gw:
     priv14:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv14.zentralwerk.org
   priv15-gw:
     priv15:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv15.zentralwerk.org
   priv16-gw:
     priv16:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv16.zentralwerk.org
   priv17-gw:
     priv17:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv17.zentralwerk.org
   priv18-gw:
     priv18:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv18.zentralwerk.org
   priv19-gw:
     priv19:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv19.zentralwerk.org
   priv20-gw:
     priv20:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv20.zentralwerk.org
   priv21-gw:
     priv21:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv21.zentralwerk.org
   priv22-gw:
     priv22:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv22.zentralwerk.org
   priv23-gw:
     priv23:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv23.zentralwerk.org
   priv24-gw:
     priv24:
       rdnss:
+        - dnscache.serv
         - upstream2.core
       dnssl:
         - priv24.zentralwerk.org
diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls
index 95c5d27..8c7fdf0 100644
--- a/salt-pillar/dhcp/init.sls
+++ b/salt-pillar/dhcp/init.sls
@@ -7,9 +7,9 @@ dhcp:
     opts:
     host-opts:
       routers: serv-gw.serv
-      domain-name-servers: upstream1.core
     string-opts:
       domain-name: serv.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   pub:
     start: 172.20.76.2
@@ -20,9 +20,9 @@ dhcp:
     opts:
     host-opts:
       routers: pub-gw.pub
-      domain-name-servers: upstream1.core
     string-opts:
       domain-name: pub.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv1:
     start: 172.20.74.2
@@ -32,9 +32,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv1-gw.priv1
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv1.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv2:
     start: 172.20.75.2
@@ -44,9 +44,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv2-gw.priv2
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv2.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv3:
     start: 172.20.74.130
@@ -56,9 +56,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv3-gw.priv3
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv3.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv4:
     start: 172.20.75.130
@@ -68,9 +68,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv4-gw.priv4
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv4.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv5:
     start: 172.20.74.66
@@ -80,9 +80,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv5-gw.priv5
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv5.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv6:
     start: 172.20.74.194
@@ -92,9 +92,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv6-gw.priv6
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv6.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv7:
     start: 172.20.75.66
@@ -104,9 +104,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv7-gw.priv7
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv7.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv8:
     start: 172.20.75.194
@@ -116,9 +116,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv8-gw.priv8
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv8.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv9:
     start: 172.20.74.34
@@ -128,9 +128,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv9-gw.priv9
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv9.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv10:
     start: 172.20.74.98
@@ -140,9 +140,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv10-gw.priv10
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv10.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv11:
     start: 172.20.74.162
@@ -152,9 +152,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv11-gw.priv11
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv11.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv12:
     start: 172.20.74.226
@@ -164,9 +164,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv12-gw.priv12
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv12.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv13:
     start: 172.20.75.34
@@ -176,9 +176,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv13-gw.priv13
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv13.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv14:
     start: 172.20.75.98
@@ -188,9 +188,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv14-gw.priv14
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv14.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv15:
     start: 172.20.75.162
@@ -200,9 +200,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv15-gw.priv15
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv15.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv16:
     start: 172.20.75.226
@@ -212,9 +212,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv16-gw.priv16
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv16.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv17:
     start: 172.20.74.18
@@ -224,9 +224,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv17-gw.priv17
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv17.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv18:
     start: 172.20.74.50
@@ -236,9 +236,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv18-gw.priv18
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv18.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv19:
     start: 172.20.73.194
@@ -249,9 +249,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv19-gw.priv19
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv19.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv20:
     start: 172.20.74.114
@@ -261,9 +261,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv20-gw.priv20
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv20.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv21:
     start: 172.20.74.146
@@ -273,9 +273,9 @@ dhcp:
     opts:
     host-opts:
       routers: priv21-gw.priv21
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: priv21.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   radio:
     start: 172.20.73.130
@@ -285,6 +285,6 @@ dhcp:
     opts:
     host-opts:
       routers: radio-gw.radio
-      domain-name-servers: upstream2.core
     string-opts:
       domain-name: radio.zentralwerk.org
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index 117a312..3dfdfcb 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -133,7 +133,8 @@ hosts-inet:
     ntp: 172.20.73.5
     minecraft: 172.20.73.6
     deployer: 172.20.73.7
-    elastic: 172.20.73.8
+    dnscache: 172.20.73.8
+    #elastic: 172.20.73.
     logging: 172.20.73.9
   priv1:
     priv1-gw: 172.20.74.1
@@ -389,6 +390,7 @@ hosts-inet6:
       stats: fd23:42:c3d2:582:2:0:0:3
       radius: fd23:42:c3d2:582:2:0:0:4
       zeit: fd23:42:c3d2:582:2:0:0:5
+      dnscache: fd23:42:c3d2:582:f096:dbff:fee8:427d
     pub:
       pub-gw: fd23:42:c3d2:583::1
     priv1:
@@ -469,6 +471,7 @@ hosts-inet6:
       stats: 2a02:8106:208:5282:2:0:0:3
       radius: 2a02:8106:208:5282:2:0:0:4
       zeit: 2a02:8106:208:5282:2:0:0:5
+      dnscache: 2a02:8106:208:5282:f096:dbff:fee8:427d
 
     pub:
       pub-gw: 2a02:8106:208:5283::1

From e488cfb1c0dba9288e33639d3a0bcd4e26744dc3 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 2 Jul 2019 19:51:44 +0200
Subject: [PATCH 3/3] dhcp: fix syntax

---
 salt-pillar/dhcp/init.sls | 48 +++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls
index 8c7fdf0..fa1630d 100644
--- a/salt-pillar/dhcp/init.sls
+++ b/salt-pillar/dhcp/init.sls
@@ -5,11 +5,11 @@ dhcp:
     time: 300
     max-time: 31536000
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: serv-gw.serv
     string-opts:
       domain-name: serv.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   pub:
     start: 172.20.76.2
@@ -18,11 +18,11 @@ dhcp:
     max-time: 3600
     lower-max-time: 50
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: pub-gw.pub
     string-opts:
       domain-name: pub.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv1:
     start: 172.20.74.2
@@ -30,11 +30,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv1-gw.priv1
     string-opts:
       domain-name: priv1.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv2:
     start: 172.20.75.2
@@ -42,11 +42,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv2-gw.priv2
     string-opts:
       domain-name: priv2.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv3:
     start: 172.20.74.130
@@ -54,11 +54,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv3-gw.priv3
     string-opts:
       domain-name: priv3.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv4:
     start: 172.20.75.130
@@ -66,11 +66,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv4-gw.priv4
     string-opts:
       domain-name: priv4.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv5:
     start: 172.20.74.66
@@ -78,11 +78,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv5-gw.priv5
     string-opts:
       domain-name: priv5.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv6:
     start: 172.20.74.194
@@ -90,11 +90,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv6-gw.priv6
     string-opts:
       domain-name: priv6.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv7:
     start: 172.20.75.66
@@ -102,11 +102,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv7-gw.priv7
     string-opts:
       domain-name: priv7.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv8:
     start: 172.20.75.194
@@ -114,11 +114,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv8-gw.priv8
     string-opts:
       domain-name: priv8.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv9:
     start: 172.20.74.34
@@ -126,11 +126,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv9-gw.priv9
     string-opts:
       domain-name: priv9.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv10:
     start: 172.20.74.98
@@ -138,11 +138,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv10-gw.priv10
     string-opts:
       domain-name: priv10.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv11:
     start: 172.20.74.162
@@ -150,11 +150,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv11-gw.priv11
     string-opts:
       domain-name: priv11.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv12:
     start: 172.20.74.226
@@ -162,11 +162,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv12-gw.priv12
     string-opts:
       domain-name: priv12.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv13:
     start: 172.20.75.34
@@ -174,11 +174,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv13-gw.priv13
     string-opts:
       domain-name: priv13.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv14:
     start: 172.20.75.98
@@ -186,11 +186,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv14-gw.priv14
     string-opts:
       domain-name: priv14.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv15:
     start: 172.20.75.162
@@ -198,11 +198,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv15-gw.priv15
     string-opts:
       domain-name: priv15.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv16:
     start: 172.20.75.226
@@ -210,11 +210,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv16-gw.priv16
     string-opts:
       domain-name: priv16.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv17:
     start: 172.20.74.18
@@ -222,11 +222,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv17-gw.priv17
     string-opts:
       domain-name: priv17.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv18:
     start: 172.20.74.50
@@ -234,11 +234,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv18-gw.priv18
     string-opts:
       domain-name: priv18.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv19:
     start: 172.20.73.194
@@ -247,11 +247,11 @@ dhcp:
     # 30 days
     max-time: 2592000
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv19-gw.priv19
     string-opts:
       domain-name: priv19.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv20:
     start: 172.20.74.114
@@ -259,11 +259,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv20-gw.priv20
     string-opts:
       domain-name: priv20.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   priv21:
     start: 172.20.74.146
@@ -271,11 +271,11 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: priv21-gw.priv21
     string-opts:
       domain-name: priv21.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
 
   radio:
     start: 172.20.73.130
@@ -283,8 +283,8 @@ dhcp:
     time: 120
     max-time: 86400
     opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
     host-opts:
       routers: radio-gw.radio
     string-opts:
       domain-name: radio.zentralwerk.org
-      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"