forked from zentralwerk/network
parent
f31506a36b
commit
a3d4a6df90
|
@ -733,6 +733,21 @@ cpe:
|
||||||
ssids:
|
ssids:
|
||||||
'ZW public':
|
'ZW public':
|
||||||
net: pub
|
net: pub
|
||||||
|
'Woarbouf':
|
||||||
|
net: priv17
|
||||||
|
psk: |
|
||||||
|
-----BEGIN PGP MESSAGE-----
|
||||||
|
|
||||||
|
hQEMA2PKcvDMvlKLAQf/W22cuyEAFGNyk6jlq6ysrWFIFkihHwrMMIdTDX8i+4V/
|
||||||
|
juUX0r70xpVL41dD/Rnbbju9hJ2TgxfDKOzBjfc1sOjc0fUGNzYT5Km1775xPU+I
|
||||||
|
H/r9+91bq23/gQCVMkQvDTWwNTiVHtB1h77aRXcaAWFg1XMOuEKU+hNyjZcstLME
|
||||||
|
/zkHT79Y7thJKMVKq60z5USKomzOle+NpD/awLrhUgcMICqO6Os4mIDff853Z0bD
|
||||||
|
tA2Fj1jY20+Mux7jq9Pcz88fYzB0+Uag+/ylJdSSSr+p9n0rLVlquxWuF0EDHOui
|
||||||
|
7PS65SMLbCPfmd/WNE0AJvLEtp80KBLRUwGwH2p/idJNAT29X5kFpfxxnC2lETCv
|
||||||
|
fvanDEpsWkVLITcyA9zF9WXGdDZ3bdyjoQJR9W/S7kCuT5+FZevZ4rZ701+ld/bs
|
||||||
|
b0wpfgtfmGVRXe3IGO4=
|
||||||
|
=t3qs
|
||||||
|
-----END PGP MESSAGE-----
|
||||||
|
|
||||||
ap19:
|
ap19:
|
||||||
password: |
|
password: |
|
||||||
|
|
|
@ -216,6 +216,18 @@ dhcp:
|
||||||
string-opts:
|
string-opts:
|
||||||
domain-name: priv16.zentralwerk.org
|
domain-name: priv16.zentralwerk.org
|
||||||
|
|
||||||
|
priv17:
|
||||||
|
start: 172.20.74.16
|
||||||
|
end: 172.20.74.30
|
||||||
|
time: 120
|
||||||
|
max-time: 86400
|
||||||
|
opts:
|
||||||
|
host-opts:
|
||||||
|
routers: priv17-gw.priv17
|
||||||
|
domain-name-servers: upstream2.core
|
||||||
|
string-opts:
|
||||||
|
domain-name: priv17.zentralwerk.org
|
||||||
|
|
||||||
radio:
|
radio:
|
||||||
start: 172.20.73.130
|
start: 172.20.73.130
|
||||||
end: 172.20.73.190
|
end: 172.20.73.190
|
||||||
|
|
|
@ -197,6 +197,17 @@ containers:
|
||||||
type: phys
|
type: phys
|
||||||
hwaddr: 0A:14:48:01:2A:17
|
hwaddr: 0A:14:48:01:2A:17
|
||||||
|
|
||||||
|
priv17-gw:
|
||||||
|
interfaces:
|
||||||
|
core:
|
||||||
|
type: veth
|
||||||
|
gw: anon1
|
||||||
|
gw6: upstream1
|
||||||
|
hwaddr: 0A:14:48:01:2A:18
|
||||||
|
priv17:
|
||||||
|
type: phys
|
||||||
|
hwaddr: 0A:14:48:01:2A:19
|
||||||
|
|
||||||
upstream1:
|
upstream1:
|
||||||
interfaces:
|
interfaces:
|
||||||
core:
|
core:
|
||||||
|
|
|
@ -374,6 +374,7 @@ switches:
|
||||||
vlans:
|
vlans:
|
||||||
- mgmt
|
- mgmt
|
||||||
- pub
|
- pub
|
||||||
|
- priv17
|
||||||
c3d2-server3:
|
c3d2-server3:
|
||||||
mode: bond
|
mode: bond
|
||||||
ports:
|
ports:
|
||||||
|
|
|
@ -11,6 +11,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
|
||||||
* 172.20.73.192/26
|
* 172.20.73.192/26
|
||||||
* 172.20.74.0/24:
|
* 172.20.74.0/24:
|
||||||
* 172.20.74.0-172.20.74.15/28 PRIV1
|
* 172.20.74.0-172.20.74.15/28 PRIV1
|
||||||
|
* 172.20.74.16-172.20.74.31/28 PRIV17
|
||||||
* 172.20.74.32-172.20.74.47/28 PRIV9
|
* 172.20.74.32-172.20.74.47/28 PRIV9
|
||||||
* 172.20.74.64-172.20.74.79/28 PRIV5
|
* 172.20.74.64-172.20.74.79/28 PRIV5
|
||||||
* 172.20.74.96-172.20.74.111/28 PRIV10
|
* 172.20.74.96-172.20.74.111/28 PRIV10
|
||||||
|
|
Loading…
Reference in New Issue