diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls index f9ab0b5..46cb485 100644 --- a/salt-pillar/cpe/aps.sls +++ b/salt-pillar/cpe/aps.sls @@ -733,6 +733,21 @@ cpe: ssids: 'ZW public': 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: password: | diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls index 8b7dc9f..5f37a5b 100644 --- a/salt-pillar/dhcp/init.sls +++ b/salt-pillar/dhcp/init.sls @@ -216,6 +216,18 @@ dhcp: string-opts: 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: start: 172.20.73.130 end: 172.20.73.190 diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls index 4e0d8a4..1393f3f 100644 --- a/salt-pillar/lxc-containers/server1.sls +++ b/salt-pillar/lxc-containers/server1.sls @@ -197,6 +197,17 @@ containers: type: phys 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: interfaces: core: