zentralwerk/network
zentralwerk
/
network
12
4
Fork 2
Code Issues 3 Pull Requests 1 Releases Wiki Activity

dhcp, radv: don't use broken dns servers

This commit is contained in:
Astro 2020-11-06 23:20:10 +01:00
parent c2b5c1a090
commit 0c6ac70b03
2 changed files with 35 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
salt-pillar/bird/radv.sls
View File

@ -3,247 +3,209 @@ radv:
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
priv25-gw:
priv25:
rdnss:
- dnscache.serv
- upstream1.core
dnssl:
- priv25.zentralwerk.org
priv26-gw:
priv26:
rdnss:
- dnscache.serv
- upstream2.core
dnssl:
- priv26.zentralwerk.org
priv27-gw:
priv27:
rdnss:
- dnscache.serv
- upstream2.core
dnssl:
- priv27.zentralwerk.org
priv28-gw:
priv28:
rdnss:
- dnscache.serv
- upstream2.core
dnssl:
- priv28.zentralwerk.org
priv29-gw:
priv29:
rdnss:
- dnscache.serv
- upstream2.core
dnssl:
- priv29.zentralwerk.org
priv30-gw:
priv30:
rdnss:
- dnscache.serv
- upstream2.core
dnssl:
- priv30.zentralwerk.org
priv31-gw:
priv31:
rdnss:
- dnscache.serv
- upstream2.core
dnssl:
- priv31.zentralwerk.org
priv32-gw:
priv32:
rdnss:
- dnscache.serv
- upstream2.core
dnssl:
- priv32.zentralwerk.org

70
salt-pillar/dhcp/init.sls
View File

@ -5,7 +5,7 @@ dhcp:
time: 604800
max-time: 31536000
opts:
domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: serv-gw.serv
string-opts:
@ -18,7 +18,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: pub-gw.pub
string-opts:
@ -30,7 +30,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv1-gw.priv1
string-opts:
@ -42,7 +42,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv2-gw.priv2
string-opts:
@ -54,7 +54,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv3-gw.priv3
string-opts:
@ -66,7 +66,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv4-gw.priv4
string-opts:
@ -78,7 +78,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv5-gw.priv5
string-opts:
@ -90,7 +90,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv6-gw.priv6
string-opts:
@ -102,7 +102,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv7-gw.priv7
string-opts:
@ -114,7 +114,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv8-gw.priv8
string-opts:
@ -126,7 +126,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv9-gw.priv9
string-opts:
@ -138,7 +138,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv10-gw.priv10
string-opts:
@ -150,7 +150,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv11-gw.priv11
string-opts:
@ -162,7 +162,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv12-gw.priv12
string-opts:
@ -174,7 +174,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv13-gw.priv13
string-opts:
@ -186,7 +186,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv14-gw.priv14
string-opts:
@ -198,7 +198,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv15-gw.priv15
string-opts:
@ -210,7 +210,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv16-gw.priv16
string-opts:
@ -222,7 +222,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv17-gw.priv17
string-opts:
@ -234,7 +234,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv18-gw.priv18
string-opts:
@ -247,7 +247,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv19-gw.priv19
string-opts:
@ -259,7 +259,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv20-gw.priv20
string-opts:
@ -271,7 +271,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv21-gw.priv21
string-opts:
@ -283,7 +283,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv22-gw.priv22
string-opts:
@ -295,7 +295,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv23-gw.priv23
string-opts:
@ -307,7 +307,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv24-gw.priv24
string-opts:
@ -319,7 +319,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv25-gw.priv25
string-opts:
@ -331,7 +331,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv26-gw.priv26
string-opts:
@ -343,7 +343,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv27-gw.priv27
string-opts:
@ -355,7 +355,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv28-gw.priv28
string-opts:
@ -367,7 +367,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv29-gw.priv29
string-opts:
@ -379,7 +379,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv30-gw.priv30
string-opts:
@ -391,7 +391,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv31-gw.priv31
string-opts:
@ -403,7 +403,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: priv32-gw.priv32
string-opts:
@ -415,7 +415,7 @@ 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"
domain-name-servers: "172.20.73.8, 9.9.9.9"
host-opts:
routers: radio-gw.radio
string-opts: