winzlieb/network
winzlieb
/
network
forked from zentralwerk/network
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

introduce dnscache.serv

This commit is contained in:
Astro 2019-07-02 19:48:43 +02:00
parent a8c79a3dea
commit 244349bd40
3 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,162 +2,192 @@ radv:
pub-gw: pub-gw:
pub: pub:
rdnss: rdnss:
- dnscache.serv
- upstream1.core - upstream1.core
- upstream2.core
dnssl: dnssl:
- pub.zentralwerk.org - pub.zentralwerk.org
serv-gw: serv-gw:
serv: serv:
rdnss: rdnss:
- dnscache.serv
- upstream1.core - upstream1.core
- upstream2.core
dnssl: dnssl:
- serv.zentralwerk.org - serv.zentralwerk.org
c3d2-gw: c3d2-gw:
c3d2: c3d2:
rdnss: rdnss:
- dnscache.serv
- upstream1.core - upstream1.core
- upstream2.core
dnssl: dnssl:
- hq.c3d2.de - hq.c3d2.de
priv1-gw: priv1-gw:
priv1: priv1:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv1.zentralwerk.org - priv1.zentralwerk.org
priv2-gw: priv2-gw:
priv2: priv2:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv2.zentralwerk.org - priv2.zentralwerk.org
priv3-gw: priv3-gw:
priv3: priv3:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv3.zentralwerk.org - priv3.zentralwerk.org
priv4-gw: priv4-gw:
priv4: priv4:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv4.zentralwerk.org - priv4.zentralwerk.org
priv5-gw: priv5-gw:
priv5: priv5:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv5.zentralwerk.org - priv5.zentralwerk.org
priv6-gw: priv6-gw:
priv6: priv6:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv6.zentralwerk.org - priv6.zentralwerk.org
priv7-gw: priv7-gw:
priv7: priv7:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv7.zentralwerk.org - priv7.zentralwerk.org
priv8-gw: priv8-gw:
priv8: priv8:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv8.zentralwerk.org - priv8.zentralwerk.org
priv9-gw: priv9-gw:
priv9: priv9:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv9.zentralwerk.org - priv9.zentralwerk.org
priv10-gw: priv10-gw:
priv10: priv10:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv10.zentralwerk.org - priv10.zentralwerk.org
priv11-gw: priv11-gw:
priv11: priv11:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv11.zentralwerk.org - priv11.zentralwerk.org
priv12-gw: priv12-gw:
priv12: priv12:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv12.zentralwerk.org - priv12.zentralwerk.org
priv13-gw: priv13-gw:
priv13: priv13:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv13.zentralwerk.org - priv13.zentralwerk.org
priv14-gw: priv14-gw:
priv14: priv14:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv14.zentralwerk.org - priv14.zentralwerk.org
priv15-gw: priv15-gw:
priv15: priv15:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv15.zentralwerk.org - priv15.zentralwerk.org
priv16-gw: priv16-gw:
priv16: priv16:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv16.zentralwerk.org - priv16.zentralwerk.org
priv17-gw: priv17-gw:
priv17: priv17:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv17.zentralwerk.org - priv17.zentralwerk.org
priv18-gw: priv18-gw:
priv18: priv18:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv18.zentralwerk.org - priv18.zentralwerk.org
priv19-gw: priv19-gw:
priv19: priv19:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv19.zentralwerk.org - priv19.zentralwerk.org
priv20-gw: priv20-gw:
priv20: priv20:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv20.zentralwerk.org - priv20.zentralwerk.org
priv21-gw: priv21-gw:
priv21: priv21:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv21.zentralwerk.org - priv21.zentralwerk.org
priv22-gw: priv22-gw:
priv22: priv22:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv22.zentralwerk.org - priv22.zentralwerk.org
priv23-gw: priv23-gw:
priv23: priv23:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv23.zentralwerk.org - priv23.zentralwerk.org
priv24-gw: priv24-gw:
priv24: priv24:
rdnss: rdnss:
- dnscache.serv
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv24.zentralwerk.org - priv24.zentralwerk.org

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

@ -7,9 +7,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: serv-gw.serv routers: serv-gw.serv
domain-name-servers: upstream1.core
string-opts: string-opts:
domain-name: serv.zentralwerk.org 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: pub:
start: 172.20.76.2 start: 172.20.76.2
@ -20,9 +20,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: pub-gw.pub routers: pub-gw.pub
domain-name-servers: upstream1.core
string-opts: string-opts:
domain-name: pub.zentralwerk.org 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: priv1:
start: 172.20.74.2 start: 172.20.74.2
@ -32,9 +32,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv1-gw.priv1 routers: priv1-gw.priv1
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv1.zentralwerk.org 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: priv2:
start: 172.20.75.2 start: 172.20.75.2
@ -44,9 +44,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv2-gw.priv2 routers: priv2-gw.priv2
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv2.zentralwerk.org 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: priv3:
start: 172.20.74.130 start: 172.20.74.130
@ -56,9 +56,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv3-gw.priv3 routers: priv3-gw.priv3
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv3.zentralwerk.org 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: priv4:
start: 172.20.75.130 start: 172.20.75.130
@ -68,9 +68,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv4-gw.priv4 routers: priv4-gw.priv4
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv4.zentralwerk.org 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: priv5:
start: 172.20.74.66 start: 172.20.74.66
@ -80,9 +80,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv5-gw.priv5 routers: priv5-gw.priv5
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv5.zentralwerk.org 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: priv6:
start: 172.20.74.194 start: 172.20.74.194
@ -92,9 +92,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv6-gw.priv6 routers: priv6-gw.priv6
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv6.zentralwerk.org 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: priv7:
start: 172.20.75.66 start: 172.20.75.66
@ -104,9 +104,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv7-gw.priv7 routers: priv7-gw.priv7
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv7.zentralwerk.org 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: priv8:
start: 172.20.75.194 start: 172.20.75.194
@ -116,9 +116,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv8-gw.priv8 routers: priv8-gw.priv8
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv8.zentralwerk.org 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: priv9:
start: 172.20.74.34 start: 172.20.74.34
@ -128,9 +128,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv9-gw.priv9 routers: priv9-gw.priv9
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv9.zentralwerk.org 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: priv10:
start: 172.20.74.98 start: 172.20.74.98
@ -140,9 +140,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv10-gw.priv10 routers: priv10-gw.priv10
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv10.zentralwerk.org 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: priv11:
start: 172.20.74.162 start: 172.20.74.162
@ -152,9 +152,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv11-gw.priv11 routers: priv11-gw.priv11
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv11.zentralwerk.org 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: priv12:
start: 172.20.74.226 start: 172.20.74.226
@ -164,9 +164,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv12-gw.priv12 routers: priv12-gw.priv12
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv12.zentralwerk.org 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: priv13:
start: 172.20.75.34 start: 172.20.75.34
@ -176,9 +176,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv13-gw.priv13 routers: priv13-gw.priv13
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv13.zentralwerk.org 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: priv14:
start: 172.20.75.98 start: 172.20.75.98
@ -188,9 +188,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv14-gw.priv14 routers: priv14-gw.priv14
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv14.zentralwerk.org 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: priv15:
start: 172.20.75.162 start: 172.20.75.162
@ -200,9 +200,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv15-gw.priv15 routers: priv15-gw.priv15
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv15.zentralwerk.org 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: priv16:
start: 172.20.75.226 start: 172.20.75.226
@ -212,9 +212,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv16-gw.priv16 routers: priv16-gw.priv16
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv16.zentralwerk.org 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: priv17:
start: 172.20.74.18 start: 172.20.74.18
@ -224,9 +224,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv17-gw.priv17 routers: priv17-gw.priv17
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv17.zentralwerk.org 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: priv18:
start: 172.20.74.50 start: 172.20.74.50
@ -236,9 +236,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv18-gw.priv18 routers: priv18-gw.priv18
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv18.zentralwerk.org 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: priv19:
start: 172.20.73.194 start: 172.20.73.194
@ -249,9 +249,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv19-gw.priv19 routers: priv19-gw.priv19
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv19.zentralwerk.org 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: priv20:
start: 172.20.74.114 start: 172.20.74.114
@ -261,9 +261,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv20-gw.priv20 routers: priv20-gw.priv20
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv20.zentralwerk.org 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: priv21:
start: 172.20.74.146 start: 172.20.74.146
@ -273,9 +273,9 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: priv21-gw.priv21 routers: priv21-gw.priv21
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv21.zentralwerk.org 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: radio:
start: 172.20.73.130 start: 172.20.73.130
@ -285,6 +285,6 @@ dhcp:
opts: opts:
host-opts: host-opts:
routers: radio-gw.radio routers: radio-gw.radio
domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: radio.zentralwerk.org domain-name: radio.zentralwerk.org
domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"

5
salt-pillar/hosts/init.sls
View File

@ -133,7 +133,8 @@ hosts-inet:
ntp: 172.20.73.5 ntp: 172.20.73.5
minecraft: 172.20.73.6 minecraft: 172.20.73.6
deployer: 172.20.73.7 deployer: 172.20.73.7
elastic: 172.20.73.8 dnscache: 172.20.73.8
#elastic: 172.20.73.
logging: 172.20.73.9 logging: 172.20.73.9
priv1: priv1:
priv1-gw: 172.20.74.1 priv1-gw: 172.20.74.1
@ -389,6 +390,7 @@ hosts-inet6:
stats: fd23:42:c3d2:582:2:0:0:3 stats: fd23:42:c3d2:582:2:0:0:3
radius: fd23:42:c3d2:582:2:0:0:4 radius: fd23:42:c3d2:582:2:0:0:4
zeit: fd23:42:c3d2:582:2:0:0:5 zeit: fd23:42:c3d2:582:2:0:0:5
dnscache: fd23:42:c3d2:582:f096:dbff:fee8:427d
pub: pub:
pub-gw: fd23:42:c3d2:583::1 pub-gw: fd23:42:c3d2:583::1
priv1: priv1:
@ -469,6 +471,7 @@ hosts-inet6:
stats: 2a02:8106:208:5282:2:0:0:3 stats: 2a02:8106:208:5282:2:0:0:3
radius: 2a02:8106:208:5282:2:0:0:4 radius: 2a02:8106:208:5282:2:0:0:4
zeit: 2a02:8106:208:5282:2:0:0:5 zeit: 2a02:8106:208:5282:2:0:0:5
dnscache: 2a02:8106:208:5282:f096:dbff:fee8:427d
pub: pub:
pub-gw: 2a02:8106:208:5283::1 pub-gw: 2a02:8106:208:5283::1