forked from zentralwerk/network
Merge branch 'master' of github.com:zentralwerk/network into master
This commit is contained in:
commit
20a03d1070
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -3,247 +3,209 @@ radv:
|
||||||
pub:
|
pub:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream1.core
|
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- pub.zentralwerk.org
|
- pub.zentralwerk.org
|
||||||
serv-gw:
|
serv-gw:
|
||||||
serv:
|
serv:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream1.core
|
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- serv.zentralwerk.org
|
- serv.zentralwerk.org
|
||||||
c3d2-gw:
|
c3d2-gw:
|
||||||
c3d2:
|
c3d2:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream1.core
|
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- hq.c3d2.de
|
- hq.c3d2.de
|
||||||
priv1-gw:
|
priv1-gw:
|
||||||
priv1:
|
priv1:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv1.zentralwerk.org
|
- priv1.zentralwerk.org
|
||||||
priv2-gw:
|
priv2-gw:
|
||||||
priv2:
|
priv2:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv2.zentralwerk.org
|
- priv2.zentralwerk.org
|
||||||
priv3-gw:
|
priv3-gw:
|
||||||
priv3:
|
priv3:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv3.zentralwerk.org
|
- priv3.zentralwerk.org
|
||||||
priv4-gw:
|
priv4-gw:
|
||||||
priv4:
|
priv4:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv4.zentralwerk.org
|
- priv4.zentralwerk.org
|
||||||
priv5-gw:
|
priv5-gw:
|
||||||
priv5:
|
priv5:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv5.zentralwerk.org
|
- priv5.zentralwerk.org
|
||||||
priv6-gw:
|
priv6-gw:
|
||||||
priv6:
|
priv6:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv6.zentralwerk.org
|
- priv6.zentralwerk.org
|
||||||
priv7-gw:
|
priv7-gw:
|
||||||
priv7:
|
priv7:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv7.zentralwerk.org
|
- priv7.zentralwerk.org
|
||||||
priv8-gw:
|
priv8-gw:
|
||||||
priv8:
|
priv8:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv8.zentralwerk.org
|
- priv8.zentralwerk.org
|
||||||
priv9-gw:
|
priv9-gw:
|
||||||
priv9:
|
priv9:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv9.zentralwerk.org
|
- priv9.zentralwerk.org
|
||||||
priv10-gw:
|
priv10-gw:
|
||||||
priv10:
|
priv10:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv10.zentralwerk.org
|
- priv10.zentralwerk.org
|
||||||
priv11-gw:
|
priv11-gw:
|
||||||
priv11:
|
priv11:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv11.zentralwerk.org
|
- priv11.zentralwerk.org
|
||||||
priv12-gw:
|
priv12-gw:
|
||||||
priv12:
|
priv12:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv12.zentralwerk.org
|
- priv12.zentralwerk.org
|
||||||
priv13-gw:
|
priv13-gw:
|
||||||
priv13:
|
priv13:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv13.zentralwerk.org
|
- priv13.zentralwerk.org
|
||||||
priv14-gw:
|
priv14-gw:
|
||||||
priv14:
|
priv14:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv14.zentralwerk.org
|
- priv14.zentralwerk.org
|
||||||
priv15-gw:
|
priv15-gw:
|
||||||
priv15:
|
priv15:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv15.zentralwerk.org
|
- priv15.zentralwerk.org
|
||||||
priv16-gw:
|
priv16-gw:
|
||||||
priv16:
|
priv16:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv16.zentralwerk.org
|
- priv16.zentralwerk.org
|
||||||
priv17-gw:
|
priv17-gw:
|
||||||
priv17:
|
priv17:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv17.zentralwerk.org
|
- priv17.zentralwerk.org
|
||||||
priv18-gw:
|
priv18-gw:
|
||||||
priv18:
|
priv18:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv18.zentralwerk.org
|
- priv18.zentralwerk.org
|
||||||
priv19-gw:
|
priv19-gw:
|
||||||
priv19:
|
priv19:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv19.zentralwerk.org
|
- priv19.zentralwerk.org
|
||||||
priv20-gw:
|
priv20-gw:
|
||||||
priv20:
|
priv20:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv20.zentralwerk.org
|
- priv20.zentralwerk.org
|
||||||
priv21-gw:
|
priv21-gw:
|
||||||
priv21:
|
priv21:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv21.zentralwerk.org
|
- priv21.zentralwerk.org
|
||||||
priv22-gw:
|
priv22-gw:
|
||||||
priv22:
|
priv22:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv22.zentralwerk.org
|
- priv22.zentralwerk.org
|
||||||
priv23-gw:
|
priv23-gw:
|
||||||
priv23:
|
priv23:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv23.zentralwerk.org
|
- priv23.zentralwerk.org
|
||||||
priv24-gw:
|
priv24-gw:
|
||||||
priv24:
|
priv24:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv24.zentralwerk.org
|
- priv24.zentralwerk.org
|
||||||
priv25-gw:
|
priv25-gw:
|
||||||
priv25:
|
priv25:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream1.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv25.zentralwerk.org
|
- priv25.zentralwerk.org
|
||||||
priv26-gw:
|
priv26-gw:
|
||||||
priv26:
|
priv26:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv26.zentralwerk.org
|
- priv26.zentralwerk.org
|
||||||
priv27-gw:
|
priv27-gw:
|
||||||
priv27:
|
priv27:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv27.zentralwerk.org
|
- priv27.zentralwerk.org
|
||||||
priv28-gw:
|
priv28-gw:
|
||||||
priv28:
|
priv28:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv28.zentralwerk.org
|
- priv28.zentralwerk.org
|
||||||
priv29-gw:
|
priv29-gw:
|
||||||
priv29:
|
priv29:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv29.zentralwerk.org
|
- priv29.zentralwerk.org
|
||||||
priv30-gw:
|
priv30-gw:
|
||||||
priv30:
|
priv30:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv30.zentralwerk.org
|
- priv30.zentralwerk.org
|
||||||
priv31-gw:
|
priv31-gw:
|
||||||
priv31:
|
priv31:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv31.zentralwerk.org
|
- priv31.zentralwerk.org
|
||||||
priv32-gw:
|
priv32-gw:
|
||||||
priv32:
|
priv32:
|
||||||
rdnss:
|
rdnss:
|
||||||
- dnscache.serv
|
- dnscache.serv
|
||||||
- upstream2.core
|
|
||||||
dnssl:
|
dnssl:
|
||||||
- priv32.zentralwerk.org
|
- priv32.zentralwerk.org
|
||||||
|
|
|
@ -134,6 +134,7 @@ cpe:
|
||||||
model: TL-WDR4300
|
model: TL-WDR4300
|
||||||
version: release
|
version: release
|
||||||
location: C3D2 Keller
|
location: C3D2 Keller
|
||||||
|
# Manually: VLAN 1+4 on port 1
|
||||||
lan-access: c3d2
|
lan-access: c3d2
|
||||||
radios:
|
radios:
|
||||||
'platform/ar934x_wmac':
|
'platform/ar934x_wmac':
|
||||||
|
@ -783,7 +784,7 @@ cpe:
|
||||||
-----END PGP MESSAGE-----
|
-----END PGP MESSAGE-----
|
||||||
model: Ubnt-UniFi-AP-AC-LR
|
model: Ubnt-UniFi-AP-AC-LR
|
||||||
version: release
|
version: release
|
||||||
location: "Foyer (DS19)"
|
location: "Foyer (DS20)"
|
||||||
radios:
|
radios:
|
||||||
'platform/qca956x_wmac':
|
'platform/qca956x_wmac':
|
||||||
channel: 1
|
channel: 1
|
||||||
|
@ -1066,11 +1067,11 @@ cpe:
|
||||||
-----END PGP MESSAGE-----
|
-----END PGP MESSAGE-----
|
||||||
model: TL-WR841Nv8
|
model: TL-WR841Nv8
|
||||||
version: release
|
version: release
|
||||||
location: Vorrat
|
location: Tunnel
|
||||||
lan-access: pub
|
lan-access: pub
|
||||||
radios:
|
radios:
|
||||||
'platform/qca953x_wmac':
|
'platform/ar943x_wmac':
|
||||||
channel: 6
|
channel: 9
|
||||||
htmode: HT40+
|
htmode: HT40+
|
||||||
ssids:
|
ssids:
|
||||||
'ZW public':
|
'ZW public':
|
||||||
|
@ -1333,7 +1334,7 @@ cpe:
|
||||||
location: "Saal A"
|
location: "Saal A"
|
||||||
radios:
|
radios:
|
||||||
'platform/qca956x_wmac':
|
'platform/qca956x_wmac':
|
||||||
channel: 1
|
channel: 5
|
||||||
htmode: HT40+
|
htmode: HT40+
|
||||||
ssids:
|
ssids:
|
||||||
'ZW public':
|
'ZW public':
|
||||||
|
@ -1361,7 +1362,7 @@ cpe:
|
||||||
-----END PGP MESSAGE-----
|
-----END PGP MESSAGE-----
|
||||||
model: Ubnt-UniFi-AP-AC-LR
|
model: Ubnt-UniFi-AP-AC-LR
|
||||||
version: release
|
version: release
|
||||||
location: "Hof (DS19)"
|
location: "Hof (DS20)"
|
||||||
radios:
|
radios:
|
||||||
'platform/qca956x_wmac':
|
'platform/qca956x_wmac':
|
||||||
channel: 9
|
channel: 9
|
||||||
|
@ -1369,42 +1370,12 @@ cpe:
|
||||||
ssids:
|
ssids:
|
||||||
'ZW public':
|
'ZW public':
|
||||||
net: pub
|
net: pub
|
||||||
'C3D2 legacy':
|
|
||||||
net: c3d2
|
|
||||||
psk: |
|
|
||||||
-----BEGIN PGP MESSAGE-----
|
|
||||||
|
|
||||||
hQEMA2PKcvDMvlKLAQf/SO/v+xhO1yOG83uCcAN2r5ixNf8+Ksp1dPwBKQHUViwJ
|
|
||||||
/KZHBAUzjTtGFIcpEy3exZcAorJ8SeGaB0hv1zw1HZuHN7Els8KKDu4G5u31Sp8w
|
|
||||||
EFtuwujlkFAt3t57jp02O0qvXBCIA14eNlakc9fcPypibTrIEGp2SCzw/kty4r3g
|
|
||||||
EGUwn1sMPjeQxon5Y4JY4OmZBXsnZkKMwTYjAbL+RS300xV1Nh/WWSTRfueAmT5f
|
|
||||||
xfyHj4NlOoBNBILgm1qlrOdgqJSvHM6rw47BoiDuxeVtgmyPqSbHmN8d7xExbuxB
|
|
||||||
tdcnI6HfSv47ZhLARH08BiI7nLaKNygwgy6yKr0zctJAAetIX8BADb4W4QgyM7VD
|
|
||||||
pYqAfy5Igg342W+ZSMyybiZccncchv4opsyDFTjuby9mqL8OwaMWkeNcNPALaT9v
|
|
||||||
rA==
|
|
||||||
=TEEI
|
|
||||||
-----END PGP MESSAGE-----
|
|
||||||
'pci0000:00/0000:00:00.0':
|
'pci0000:00/0000:00:00.0':
|
||||||
channel: 149
|
channel: 149
|
||||||
htmode: VHT80
|
htmode: VHT80
|
||||||
ssids:
|
ssids:
|
||||||
'ZW public':
|
'ZW public':
|
||||||
net: pub
|
net: pub
|
||||||
'C3D2':
|
|
||||||
net: c3d2
|
|
||||||
psk: |
|
|
||||||
-----BEGIN PGP MESSAGE-----
|
|
||||||
|
|
||||||
hQEMA2PKcvDMvlKLAQf/SO/v+xhO1yOG83uCcAN2r5ixNf8+Ksp1dPwBKQHUViwJ
|
|
||||||
/KZHBAUzjTtGFIcpEy3exZcAorJ8SeGaB0hv1zw1HZuHN7Els8KKDu4G5u31Sp8w
|
|
||||||
EFtuwujlkFAt3t57jp02O0qvXBCIA14eNlakc9fcPypibTrIEGp2SCzw/kty4r3g
|
|
||||||
EGUwn1sMPjeQxon5Y4JY4OmZBXsnZkKMwTYjAbL+RS300xV1Nh/WWSTRfueAmT5f
|
|
||||||
xfyHj4NlOoBNBILgm1qlrOdgqJSvHM6rw47BoiDuxeVtgmyPqSbHmN8d7xExbuxB
|
|
||||||
tdcnI6HfSv47ZhLARH08BiI7nLaKNygwgy6yKr0zctJAAetIX8BADb4W4QgyM7VD
|
|
||||||
pYqAfy5Igg342W+ZSMyybiZccncchv4opsyDFTjuby9mqL8OwaMWkeNcNPALaT9v
|
|
||||||
rA==
|
|
||||||
=TEEI
|
|
||||||
-----END PGP MESSAGE-----
|
|
||||||
|
|
||||||
# eth0: b0:4e:26:b0:7c:34
|
# eth0: b0:4e:26:b0:7c:34
|
||||||
# wlan2: b0:4e:26:b0:7c:34
|
# wlan2: b0:4e:26:b0:7c:34
|
||||||
|
|
|
@ -5,7 +5,7 @@ dhcp:
|
||||||
time: 604800
|
time: 604800
|
||||||
max-time: 31536000
|
max-time: 31536000
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: serv-gw.serv
|
routers: serv-gw.serv
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -18,7 +18,7 @@ dhcp:
|
||||||
max-time: 3600
|
max-time: 3600
|
||||||
lower-max-time: 50
|
lower-max-time: 50
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: pub-gw.pub
|
routers: pub-gw.pub
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -30,7 +30,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv1-gw.priv1
|
routers: priv1-gw.priv1
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -42,7 +42,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv2-gw.priv2
|
routers: priv2-gw.priv2
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -54,7 +54,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv3-gw.priv3
|
routers: priv3-gw.priv3
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -66,7 +66,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv4-gw.priv4
|
routers: priv4-gw.priv4
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -78,7 +78,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv5-gw.priv5
|
routers: priv5-gw.priv5
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -90,7 +90,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv6-gw.priv6
|
routers: priv6-gw.priv6
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -102,7 +102,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv7-gw.priv7
|
routers: priv7-gw.priv7
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -114,7 +114,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv8-gw.priv8
|
routers: priv8-gw.priv8
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -126,7 +126,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv9-gw.priv9
|
routers: priv9-gw.priv9
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -138,7 +138,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv10-gw.priv10
|
routers: priv10-gw.priv10
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -150,7 +150,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv11-gw.priv11
|
routers: priv11-gw.priv11
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -162,7 +162,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv12-gw.priv12
|
routers: priv12-gw.priv12
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -174,7 +174,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv13-gw.priv13
|
routers: priv13-gw.priv13
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -186,7 +186,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv14-gw.priv14
|
routers: priv14-gw.priv14
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -198,7 +198,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv15-gw.priv15
|
routers: priv15-gw.priv15
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -210,7 +210,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv16-gw.priv16
|
routers: priv16-gw.priv16
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -222,7 +222,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv17-gw.priv17
|
routers: priv17-gw.priv17
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -234,7 +234,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv18-gw.priv18
|
routers: priv18-gw.priv18
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -247,7 +247,7 @@ dhcp:
|
||||||
# 30 days
|
# 30 days
|
||||||
max-time: 2592000
|
max-time: 2592000
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv19-gw.priv19
|
routers: priv19-gw.priv19
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -259,7 +259,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv20-gw.priv20
|
routers: priv20-gw.priv20
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -271,7 +271,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv21-gw.priv21
|
routers: priv21-gw.priv21
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -283,7 +283,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv22-gw.priv22
|
routers: priv22-gw.priv22
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -295,7 +295,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv23-gw.priv23
|
routers: priv23-gw.priv23
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -307,7 +307,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv24-gw.priv24
|
routers: priv24-gw.priv24
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -319,7 +319,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv25-gw.priv25
|
routers: priv25-gw.priv25
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -331,7 +331,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv26-gw.priv26
|
routers: priv26-gw.priv26
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -343,7 +343,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv27-gw.priv27
|
routers: priv27-gw.priv27
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -355,7 +355,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv28-gw.priv28
|
routers: priv28-gw.priv28
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -367,7 +367,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv29-gw.priv29
|
routers: priv29-gw.priv29
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -379,7 +379,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv30-gw.priv30
|
routers: priv30-gw.priv30
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -391,7 +391,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv31-gw.priv31
|
routers: priv31-gw.priv31
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -403,7 +403,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: priv32-gw.priv32
|
routers: priv32-gw.priv32
|
||||||
string-opts:
|
string-opts:
|
||||||
|
@ -415,7 +415,7 @@ dhcp:
|
||||||
time: 120
|
time: 120
|
||||||
max-time: 86400
|
max-time: 86400
|
||||||
opts:
|
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:
|
host-opts:
|
||||||
routers: radio-gw.radio
|
routers: radio-gw.radio
|
||||||
string-opts:
|
string-opts:
|
||||||
|
|
|
@ -363,7 +363,7 @@ switches:
|
||||||
- GigabitEthernet 1/0/11
|
- GigabitEthernet 1/0/11
|
||||||
- GigabitEthernet 1/0/20
|
- GigabitEthernet 1/0/20
|
||||||
- GigabitEthernet 1/0/24
|
- GigabitEthernet 1/0/24
|
||||||
ap21:
|
ap18:
|
||||||
mode: trunk
|
mode: trunk
|
||||||
ports:
|
ports:
|
||||||
- GigabitEthernet 1/0/18
|
- GigabitEthernet 1/0/18
|
||||||
|
@ -571,7 +571,7 @@ switches:
|
||||||
iso6:
|
iso6:
|
||||||
mode: access
|
mode: access
|
||||||
ports: '14'
|
ports: '14'
|
||||||
priv25:
|
pub:
|
||||||
mode: access
|
mode: access
|
||||||
# Saal A Foyer
|
# Saal A Foyer
|
||||||
ports: '20'
|
ports: '20'
|
||||||
|
@ -782,6 +782,8 @@ switches:
|
||||||
ports:
|
ports:
|
||||||
- 1
|
- 1
|
||||||
- 2
|
- 2
|
||||||
|
- 5
|
||||||
|
- 6
|
||||||
switch-c1:
|
switch-c1:
|
||||||
mode: trunk
|
mode: trunk
|
||||||
ports: 7,1/0/8
|
ports: 7,1/0/8
|
||||||
|
@ -804,11 +806,6 @@ switches:
|
||||||
- mgmt
|
- mgmt
|
||||||
- pub
|
- pub
|
||||||
- priv25
|
- priv25
|
||||||
pub:
|
|
||||||
mode: access
|
|
||||||
ports:
|
|
||||||
- 5
|
|
||||||
- 6
|
|
||||||
password: |
|
password: |
|
||||||
-----BEGIN PGP MESSAGE-----
|
-----BEGIN PGP MESSAGE-----
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@ set network.mgmt.gateway={{ pillar['hosts-inet']['mgmt']['mgmt-gw'] }}
|
||||||
set network.mgmt.ip6addr={{ pillar['hosts-inet6']['dn42']['mgmt'][hostname] }}/64
|
set network.mgmt.ip6addr={{ pillar['hosts-inet6']['dn42']['mgmt'][hostname] }}/64
|
||||||
set network.mgmt.ip6gw={{ pillar['hosts-inet6']['dn42']['mgmt']['mgmt-gw'] }}
|
set network.mgmt.ip6gw={{ pillar['hosts-inet6']['dn42']['mgmt']['mgmt-gw'] }}
|
||||||
delete network.mgmt.dns
|
delete network.mgmt.dns
|
||||||
|
add_list network.mgmt.dns=172.20.73.8
|
||||||
add_list network.mgmt.dns={{ pillar['hosts-inet']['core']['upstream1'] }}
|
add_list network.mgmt.dns={{ pillar['hosts-inet']['core']['upstream1'] }}
|
||||||
add_list network.mgmt.dns={{ pillar['hosts-inet6']['dn42']['core']['upstream1'] }}
|
add_list network.mgmt.dns={{ pillar['hosts-inet6']['dn42']['core']['upstream1'] }}
|
||||||
add_list network.mgmt.dns={{ pillar['hosts-inet']['core']['upstream2'] }}
|
add_list network.mgmt.dns={{ pillar['hosts-inet']['core']['upstream2'] }}
|
||||||
|
|
|
@ -37,7 +37,6 @@ base:
|
||||||
- no-ssh
|
- no-ssh
|
||||||
- forwarding
|
- forwarding
|
||||||
- bird
|
- bird
|
||||||
- unbound
|
|
||||||
- upstream.dhcp
|
- upstream.dhcp
|
||||||
- upstream.shaping
|
- upstream.shaping
|
||||||
- upstream.dyndns
|
- upstream.dyndns
|
||||||
|
|
Loading…
Reference in New Issue