diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls index 44a75fe..9ed8dd9 100644 --- a/salt-pillar/cpe/aps.sls +++ b/salt-pillar/cpe/aps.sls @@ -700,6 +700,21 @@ cpe: 30ApK4QsLK+DiA== =yu0N -----END PGP MESSAGE----- + 'Zweitwohnsitz': + net: priv34 + psk: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf/T0+FaX2oOHDhss1m2A/PmOBf5HQi7UpnbJX0fKcUiat+ + 2LWaO2nAGNBN1+U/CF1V51ZVtCmrJJgK+PHQlOP6YspR/eeRISynXqFSGXW3vDWV + bxBXwT4iJGFviVXZIpo1OpyDDwQo9c6pi1O/nOq/0EFkjdys26JVyz9n4ib6YPAk + PETAbANXq0/wltJh1k4LA9Gfls5w7YznF9jjABIUmelsqXBSzL+GTRPAMZq6RwAl + gngMVDlu8FLGOLxeWKHO6JNj+WlGqj5k8s8oF1/6wijHajcI3vz3gUbrMcwy+nPs + WUrBT9MetkjJv/6MtczLz9ItlzJBzQ/rJhEz/JUxJNJDAU+H2YBd4d6hh8byCKvh + NwWssajGlb4cVkz06r6+VBDjPsOAMTIV40JNVO6ddeIkLC5ktscUuQK0GI3RfyC0 + kicZ/w== + =hcsJ + -----END PGP MESSAGE----- ap18: password: | diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls index b044399..30b2d2d 100644 --- a/salt-pillar/dhcp/init.sls +++ b/salt-pillar/dhcp/init.sls @@ -423,3 +423,15 @@ dhcp: routers: priv33-gw.priv33 string-opts: domain-name: priv33.zentralwerk.org + + priv34: + start: 172.20.74.210 + end: 172.20.74.222 + time: 120 + max-time: 86400 + opts: + domain-name-servers: "172.20.73.8, 9.9.9.9" + host-opts: + routers: priv34-gw.priv34 + string-opts: + domain-name: priv34.zentralwerk.org diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls index 49b0786..b8eff14 100644 --- a/salt-pillar/hosts/init.sls +++ b/salt-pillar/hosts/init.sls @@ -149,6 +149,7 @@ hosts-inet: priv31-gw: 172.20.72.45 priv32-gw: 172.20.72.46 priv33-gw: 172.20.72.47 + priv34-gw: 172.20.72.48 pub: pub-gw: 172.20.76.1 @@ -373,6 +374,11 @@ hosts-inet: {%- for i in range(1, 14) %} dhcp{{ i }}: 172.20.74.{{ 17 + i }} {%- endfor %} + priv34: + priv34-gw: 172.20.74.209 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.74.{{ 209 + i }} +{%- endfor %} radio: radio-gw: 172.20.73.129 @@ -512,6 +518,7 @@ hosts-inet6: priv31-gw: fd23:42:c3d2:581::c:1e priv32-gw: fd23:42:c3d2:581::c:1f priv33-gw: fd23:42:c3d2:581::c:20 + priv34-gw: fd23:42:c3d2:581::c:21 freifunk: fd23:42:c3d2:581:8000::1 @@ -591,6 +598,8 @@ hosts-inet6: priv32-gw: fd23:42:c3d2:5df::1 priv33: priv33-gw: fd23:42:c3d2:5e0::1 + priv34: + priv33-gw: fd23:42:c3d2:5e1::1 radio: radio-gw: fd23:42:c3d2:586::1 @@ -674,6 +683,7 @@ hosts-inet6: priv31-gw: 2a02:8106:211:e981::c:1e priv32-gw: 2a02:8106:211:e981::c:1f priv33-gw: 2a02:8106:211:e981::c:20 + priv34-gw: 2a02:8106:211:e981::c:21 radio: radio-gw: 2a02:8106:208:5286::1 @@ -744,3 +754,5 @@ hosts-inet6: priv32-gw: 2a02:8106:211:e9df::1 priv33: priv33-gw: 2a02:8106:211:e9e0::1 + priv34: + priv34-gw: 2a02:8106:211:e9e1::1 diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls index a06bce2..5b1ab05 100644 --- a/salt-pillar/lxc-containers/server1.sls +++ b/salt-pillar/lxc-containers/server1.sls @@ -384,6 +384,17 @@ containers: type: phys hwaddr: 0A:14:48:01:2A:39 + priv34-gw: + interfaces: + core: + type: veth + gw: upstream2 + gw6: upstream2 + hwaddr: 0A:14:48:01:2A:40 + priv34: + type: phys + hwaddr: 0A:14:48:01:2A:41 + upstream1: interfaces: core: diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls index 01dbc9d..139250c 100644 --- a/salt-pillar/subnets/init.sls +++ b/salt-pillar/subnets/init.sls @@ -34,6 +34,8 @@ subnets-inet: priv31: 172.20.75.208/28 priv16: 172.20.75.224/28 priv32: 172.20.75.240/28 + priv33: 172.20.74.16/28 + priv34: 172.20.74.208/28 c3d2: 172.22.99.0/24 mgmt: 10.0.0.0/24 priv17: 172.20.73.128/27 @@ -77,6 +79,7 @@ subnets-inet6: priv31: fd23:42:c3d2:5de::/64 priv32: fd23:42:c3d2:5df::/64 priv33: fd23:42:c3d2:5e0::/64 + priv34: fd23:42:c3d2:5e1::/64 c3d2: fd23:42:c3d2:523::/64 up1: c3d2: 2a02:8106:208:5201::/64 @@ -118,3 +121,4 @@ subnets-inet6: priv31: 2a02:8106:211:e9de::/64 priv32: 2a02:8106:211:e9df::/64 priv33: 2a02:8106:211:e9e0::/64 + priv34: 2a02:8106:211:e9e1::/64 diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls index 20bfd0f..d3f6aa1 100644 --- a/salt-pillar/switches/init.sls +++ b/salt-pillar/switches/init.sls @@ -111,6 +111,7 @@ switches: - priv31 - priv32 - priv33 + - priv34 - iso1 - iso2 - iso3 @@ -198,6 +199,7 @@ switches: - priv31 - priv32 - priv33 + - priv34 c3d2-server4: mode: bond group: 1 @@ -549,6 +551,7 @@ switches: - priv31 - priv32 - priv33 + - priv34 up1: mode: access ports: '1' @@ -632,6 +635,7 @@ switches: - pub - priv29 - priv33 + - priv34 ap38: mode: trunk ports: 7 diff --git a/subnets.md b/subnets.md index 29c0ba7..bc6dfe0 100644 --- a/subnets.md +++ b/subnets.md @@ -24,7 +24,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * 172.20.74.160/28 PRIV11 * 172.20.74.176/28 PRIV22 * 172.20.74.192/28 PRIV6 - * 172.20.74.208/28 PRIV23 + * 172.20.74.208/28 PRIV34 * 172.20.74.224/28 PRIV12 * 172.20.74.240/28 PRIV24 * 172.20.75.0/24