diff --git a/salt-pillar/bird/radv.sls b/salt-pillar/bird/radv.sls index 752c115..ca13f82 100644 --- a/salt-pillar/bird/radv.sls +++ b/salt-pillar/bird/radv.sls @@ -205,3 +205,45 @@ radv: - upstream2.core dnssl: - priv26.zentralwerk.org + priv27-gw: + priv27: + rdnss: + - dnscache.serv + - upstream2.core + dnssl: + - priv27.zentralwerk.org + priv28-gw: + priv28: + rdnss: + - dnscache.serv + - upstream2.core + dnssl: + - priv28.zentralwerk.org + priv29-gw: + priv29: + rdnss: + - dnscache.serv + - upstream2.core + dnssl: + - priv29.zentralwerk.org + priv30-gw: + priv30: + rdnss: + - dnscache.serv + - upstream2.core + dnssl: + - priv30.zentralwerk.org + priv31-gw: + priv31: + rdnss: + - dnscache.serv + - upstream2.core + dnssl: + - priv31.zentralwerk.org + priv32-gw: + priv32: + rdnss: + - dnscache.serv + - upstream2.core + dnssl: + - priv32.zentralwerk.org diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls index 80abb39..8dfbb47 100644 --- a/salt-pillar/dhcp/init.sls +++ b/salt-pillar/dhcp/init.sls @@ -337,6 +337,78 @@ dhcp: string-opts: domain-name: priv26.zentralwerk.org + priv27: + start: 172.20.75.82 + end: 172.20.75.94 + time: 120 + max-time: 86400 + opts: + domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9" + host-opts: + routers: priv27-gw.priv27 + string-opts: + domain-name: priv27.zentralwerk.org + + priv28: + start: 172.20.75.114 + end: 172.20.75.110 + time: 120 + max-time: 86400 + opts: + domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9" + host-opts: + routers: priv28-gw.priv28 + string-opts: + domain-name: priv28.zentralwerk.org + + priv29: + start: 172.20.75.146 + end: 172.20.75.158 + time: 120 + max-time: 86400 + opts: + domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9" + host-opts: + routers: priv29-gw.priv29 + string-opts: + domain-name: priv29.zentralwerk.org + + priv30: + start: 172.20.75.178 + end: 172.20.75.190 + time: 120 + max-time: 86400 + opts: + domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9" + host-opts: + routers: priv30-gw.priv30 + string-opts: + domain-name: priv30.zentralwerk.org + + priv31: + start: 172.20.75.210 + end: 172.20.75.222 + time: 120 + max-time: 86400 + opts: + domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9" + host-opts: + routers: priv31-gw.priv31 + string-opts: + domain-name: priv31.zentralwerk.org + + priv32: + start: 172.20.75.242 + end: 172.20.75.254 + time: 120 + max-time: 86400 + opts: + domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9" + host-opts: + routers: priv32-gw.priv32 + string-opts: + domain-name: priv32.zentralwerk.org + radio: start: 172.20.73.130 end: 172.20.73.190 diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls index b176b31..c131640 100644 --- a/salt-pillar/hosts/init.sls +++ b/salt-pillar/hosts/init.sls @@ -128,6 +128,12 @@ hosts-inet: priv25-gw: 172.20.72.38 priv26-gw: 172.20.72.39 freifunk: 172.20.72.40 + priv27-gw: 172.20.72.41 + priv28-gw: 172.20.72.42 + priv29-gw: 172.20.72.43 + priv30-gw: 172.20.72.44 + priv31-gw: 172.20.72.45 + priv32-gw: 172.20.72.46 pub: pub-gw: 172.20.76.1 @@ -313,7 +319,37 @@ hosts-inet: priv26: priv26-gw: 172.20.75.49 {%- for i in range(1, 14) %} - dhcp{{ i }}: 172.20.74.{{ 49 + i }} + dhcp{{ i }}: 172.20.75.{{ 49 + i }} +{%- endfor %} + priv27: + priv27-gw: 172.20.75.81 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.75.{{ 81 + i }} +{%- endfor %} + priv28: + priv28-gw: 172.20.75.113 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.75.{{ 113 + i }} +{%- endfor %} + priv29: + priv29-gw: 172.20.75.145 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.75.{{ 145 + i }} +{%- endfor %} + priv30: + priv30-gw: 172.20.75.177 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.75.{{ 177 + i }} +{%- endfor %} + priv31: + priv31-gw: 172.20.75.209 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.75.{{ 209 + i }} +{%- endfor %} + priv32: + priv32-gw: 172.20.75.241 +{%- for i in range(1, 14) %} + dhcp{{ i }}: 172.20.75.{{ 241 + i }} {%- endfor %} radio: @@ -447,6 +483,12 @@ hosts-inet6: priv24-gw: fd23:42:c3d2:581::c:17 priv25-gw: fd23:42:c3d2:581::c:18 priv26-gw: fd23:42:c3d2:581::c:19 + priv27-gw: fd23:42:c3d2:581::c:1a + priv28-gw: fd23:42:c3d2:581::c:1b + priv29-gw: fd23:42:c3d2:581::c:1c + priv30-gw: fd23:42:c3d2:581::c:1d + priv31-gw: fd23:42:c3d2:581::c:1e + priv32-gw: fd23:42:c3d2:581::c:1f freifunk: fd23:42:c3d2:581:8000::1 @@ -511,6 +553,18 @@ hosts-inet6: priv25-gw: fd23:42:c3d2:5d8::1 priv26: priv26-gw: fd23:42:c3d2:5d9::1 + priv27: + priv27-gw: fd23:42:c3d2:5da::1 + priv28: + priv28-gw: fd23:42:c3d2:5db::1 + priv29: + priv29-gw: fd23:42:c3d2:5dc::1 + priv30: + priv30-gw: fd23:42:c3d2:5dd::1 + priv31: + priv31-gw: fd23:42:c3d2:5de::1 + priv32: + priv32-gw: fd23:42:c3d2:5df::1 radio: radio-gw: fd23:42:c3d2:586::1 @@ -586,6 +640,12 @@ hosts-inet6: priv24-gw: 2a02:8106:211:e981::c:17 priv25-gw: 2a02:8106:211:e981::c:18 priv26-gw: 2a02:8106:211:e981::c:19 + priv27-gw: 2a02:8106:211:e981::c:1a + priv28-gw: 2a02:8106:211:e981::c:1b + priv29-gw: 2a02:8106:211:e981::c:1c + priv30-gw: 2a02:8106:211:e981::c:1d + priv31-gw: 2a02:8106:211:e981::c:1e + priv32-gw: 2a02:8106:211:e981::c:1f radio: radio-gw: 2a02:8106:208:5286::1 @@ -642,3 +702,15 @@ hosts-inet6: priv25-gw: 2a02:8106:211:e9d8::1 priv26: priv26-gw: 2a02:8106:211:e9d9::1 + priv27: + priv27-gw: 2a02:8106:211:e9da::1 + priv28: + priv28-gw: 2a02:8106:211:e9db::1 + priv29: + priv29-gw: 2a02:8106:211:e9dc::1 + priv30: + priv30-gw: 2a02:8106:211:e9dd::1 + priv31: + priv31-gw: 2a02:8106:211:e9de::1 + priv32: + priv32-gw: 2a02:8106:211:e9df::1 diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls index 9b63955..9924241 100644 --- a/salt-pillar/subnets/init.sls +++ b/salt-pillar/subnets/init.sls @@ -23,11 +23,17 @@ subnets-inet: priv13: 172.20.75.32/28 priv26: 172.20.75.48/28 priv7: 172.20.75.64/28 + priv27: 172.20.75.80/28 priv14: 172.20.75.96/28 + priv28: 172.20.75.112/28 priv4: 172.20.75.128/28 + priv29: 172.20.75.144/28 priv15: 172.20.75.160/28 + priv30: 172.20.75.176/28 priv8: 172.20.75.192/28 + priv31: 172.20.75.208/28 priv16: 172.20.75.224/28 + priv32: 172.20.75.240/28 c3d2: 172.22.99.0/24 mgmt: 10.0.0.0/24 radio: 172.20.73.128/26 @@ -65,6 +71,12 @@ subnets-inet6: priv24: fd23:42:c3d2:5d7::/64 priv25: fd23:42:c3d2:5d8::/64 priv26: fd23:42:c3d2:5d9::/64 + priv27: fd23:42:c3d2:5da::/64 + priv28: fd23:42:c3d2:5db::/64 + priv29: fd23:42:c3d2:5dc::/64 + priv30: fd23:42:c3d2:5dd::/64 + priv31: fd23:42:c3d2:5de::/64 + priv32: fd23:42:c3d2:5df::/64 c3d2: fd23:42:c3d2:523::/64 up1: c3d2: 2a02:8106:208:5201::/64 @@ -100,3 +112,9 @@ subnets-inet6: priv24: 2a02:8106:211:e9d7::/64 priv25: 2a02:8106:211:e9d8::/64 priv26: 2a02:8106:211:e9d9::/64 + priv27: 2a02:8106:211:e9da::/64 + priv28: 2a02:8106:211:e9db::/64 + priv29: 2a02:8106:211:e9dc::/64 + priv30: 2a02:8106:211:e9dd::/64 + priv31: 2a02:8106:211:e9de::/64 + priv32: 2a02:8106:211:e9df::/64 diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls index 6efefa2..8be3a9d 100644 --- a/salt-pillar/switches/init.sls +++ b/salt-pillar/switches/init.sls @@ -182,6 +182,12 @@ switches: - priv24 - priv25 - priv26 + - priv27 + - priv28 + - priv29 + - priv30 + - priv31 + - priv32 c3d2-server4: mode: bond ports: diff --git a/salt-pillar/vlans/init.sls b/salt-pillar/vlans/init.sls index 36278b4..5d4fba1 100644 --- a/salt-pillar/vlans/init.sls +++ b/salt-pillar/vlans/init.sls @@ -47,6 +47,12 @@ vlans: priv24: 63 priv25: 64 priv26: 65 + priv27: 66 + priv28: 67 + priv29: 68 + priv30: 69 + priv31: 70 + priv32: 71 # Isolated neighbors directly connection with their modems iso1: 101 iso2: 102 diff --git a/subnets.md b/subnets.md index b5f4542..4015a83 100644 --- a/subnets.md +++ b/subnets.md @@ -31,13 +31,18 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls) * 172.20.75.32-172.20.75.47/28 PRIV13 * 172.20.75.48-172.20.75.63/28 PRIV26 * 172.20.75.64-172.20.75.79/28 PRIV7 + * 172.20.75.80-172.20.75.95/28 PRIV27 * 172.20.75.96-172.20.75.111/28 PRIV14 + * 172.20.75.112-172.20.75.111/28 PRIV28 * 172.20.75.128-172.20.75.143/28 PRIV4 + * 172.20.75.144-172.20.75.159/28 PRIV29 * 172.20.75.160-172.20.75.175/28 PRIV15 + * 172.20.75.176-172.20.75.191/28 PRIV30 * 172.20.75.192-172.20.75.207/28 PRIV8 + * 172.20.75.208-172.20.75.223/28 PRIV31 * 172.20.75.224-172.20.75.239/28 PRIV16 + * 172.20.75.240-172.20.75.255/28 PRIV32 * 172.20.76.0-172.20.79.255/22 PUBLIC -* 172.20.78.0-172.20.79.255/23 RESERVED FOR EXPANDING PUBLIC ## RFC 1918: non-routed