priv33: prepare

2021-02-08 17:09:38 +01:00 · 2021-02-08 17:09:38 +01:00 · 8020fd7cb9
parent dcfd9b3c27
commit 8020fd7cb9
9 changed files with 62 additions and 14 deletions
--- a/salt-pillar/bird/radv.sls
+++ b/salt-pillar/bird/radv.sls
@ -209,3 +209,9 @@ radv:
        - dnscache.serv
      dnssl:
        - priv32.zentralwerk.org
+  priv33-gw:
+    priv33:
+      rdnss:
+        - dnscache.serv
+      dnssl:
+        - priv33.zentralwerk.org
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@ -662,7 +662,7 @@ cpe:
    model: TL-WR1043ND
    version: release
    location: Turm C, 2. Etage
-    lan-access: pub
+    lan-access: priv33
    radios:
      'platform/qca955x_wmac':
        channel: 5
@ -670,20 +670,20 @@ cpe:
        ssids:
          'ZW public':
            net: pub
-          'C3D2 legacy':
-            net: c3d2
+          'EDUB':
+            net: priv33
            psk: |
              -----BEGIN PGP MESSAGE-----
              
-              hQEMA2PKcvDMvlKLAQf/SO/v+xhO1yOG83uCcAN2r5ixNf8+Ksp1dPwBKQHUViwJ
-              /KZHBAUzjTtGFIcpEy3exZcAorJ8SeGaB0hv1zw1HZuHN7Els8KKDu4G5u31Sp8w
-              EFtuwujlkFAt3t57jp02O0qvXBCIA14eNlakc9fcPypibTrIEGp2SCzw/kty4r3g
-              EGUwn1sMPjeQxon5Y4JY4OmZBXsnZkKMwTYjAbL+RS300xV1Nh/WWSTRfueAmT5f
-              xfyHj4NlOoBNBILgm1qlrOdgqJSvHM6rw47BoiDuxeVtgmyPqSbHmN8d7xExbuxB
-              tdcnI6HfSv47ZhLARH08BiI7nLaKNygwgy6yKr0zctJAAetIX8BADb4W4QgyM7VD
-              pYqAfy5Igg342W+ZSMyybiZccncchv4opsyDFTjuby9mqL8OwaMWkeNcNPALaT9v
-              rA==
-              =TEEI
+              hQEMA2PKcvDMvlKLAQgAkMCq5lf8bWqJXTwAvqXOEhZE70KNF+3gipNBPionPfCi
+              RU4DCh/zI2sTj6QjBE5wAHAB5kOO7M7eH7JB13D22+eqm7oJt0k+YsgE6qADiWRx
+              NK9OUs7wM6truzgOkP4FGF4ZOBs1akBH4uY7TxdzZZ7XYNnNSaG3ttikUb0fJ/gR
+              IoXkpLR3GX02vEN2ewwH9jomUQ5ZptNUQBnaoeyf3cYdS1SFH91LCG44Tc4EsrmO
+              YPNLmUAqxAkt0P9GMTxEetym0l4N8sjO6e4dIylPdLGAW1LpG7ijWPWKIsmiISRd
+              ZfHWBbCu9ltJDf5AOjbtZjSNtMVkqe1dxlL4uw+Q8tJVARQw6DN3IEJp+FMXWuEA
+              DDZBB4WcCVcoIo8diKjYWNN1uZprMFDHaSg8qQkUf6nH00V6Gfe4CEwW7MpL1iTo
+              BHPsTvBc/4tMJUv4omzu+qqEfz47Sw==
+              =Cgdf
              -----END PGP MESSAGE-----
          'e-Stuetzpunkt':
            net: priv29
--- a/salt-pillar/dhcp/init.sls
+++ b/salt-pillar/dhcp/init.sls
@ -411,3 +411,15 @@ dhcp:
      routers: priv32-gw.priv32
    string-opts:
      domain-name: priv32.zentralwerk.org
+
+  priv33:
+    start: 172.20.74.18
+    end: 172.20.74.30
+    time: 120
+    max-time: 86400
+    opts:
+      domain-name-servers: "172.20.73.8, 9.9.9.9"
+    host-opts:
+      routers: priv33-gw.priv33
+    string-opts:
+      domain-name: priv33.zentralwerk.org
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@ -148,6 +148,7 @@ hosts-inet:
    priv30-gw: 172.20.72.44
    priv31-gw: 172.20.72.45
    priv32-gw: 172.20.72.46
+    priv33-gw: 172.20.72.47

  pub:
    pub-gw: 172.20.76.1
@ -367,6 +368,11 @@ hosts-inet:
 {%- for i in range(1, 14) %}
    dhcp{{ i }}: 172.20.75.{{ 241 + i }}
 {%- endfor %}
+  priv33:
+    priv33-gw: 172.20.74.17
+{%- for i in range(1, 14) %}
+    dhcp{{ i }}: 172.20.74.{{ 17 + i }}
+{%- endfor %}

  radio:
    radio-gw: 172.20.73.129
@ -505,6 +511,7 @@ hosts-inet6:
      priv30-gw: fd23:42:c3d2:581::c:1d
      priv31-gw: fd23:42:c3d2:581::c:1e
      priv32-gw: fd23:42:c3d2:581::c:1f
+      priv33-gw: fd23:42:c3d2:581::c:20

      freifunk: fd23:42:c3d2:581:8000::1

@ -582,6 +589,8 @@ hosts-inet6:
      priv31-gw: fd23:42:c3d2:5de::1
    priv32:
      priv32-gw: fd23:42:c3d2:5df::1
+    priv33:
+      priv33-gw: fd23:42:c3d2:5e0::1

    radio:
      radio-gw: fd23:42:c3d2:586::1
@ -664,6 +673,7 @@ hosts-inet6:
      priv30-gw: 2a02:8106:211:e981::c:1d
      priv31-gw: 2a02:8106:211:e981::c:1e
      priv32-gw: 2a02:8106:211:e981::c:1f
+      priv33-gw: 2a02:8106:211:e981::c:20

    radio:
      radio-gw: 2a02:8106:208:5286::1
@ -732,3 +742,5 @@ hosts-inet6:
      priv31-gw: 2a02:8106:211:e9de::1
    priv32:
      priv32-gw: 2a02:8106:211:e9df::1
+    priv33:
+      priv33-gw: 2a02:8106:211:e9e0::1
--- a/salt-pillar/lxc-containers/server1.sls
+++ b/salt-pillar/lxc-containers/server1.sls
@ -373,6 +373,17 @@ containers:
        type: phys
        hwaddr: 0A:14:48:01:2A:37

+  priv33-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: upstream2
+        gw6: upstream2
+        hwaddr: 0A:14:48:01:2A:38
+      priv33:
+        type: phys
+        hwaddr: 0A:14:48:01:2A:39
+
  upstream1:
    interfaces:
      core:
--- a/salt-pillar/subnets/init.sls
+++ b/salt-pillar/subnets/init.sls
@ -4,6 +4,7 @@ subnets-inet:
  pub: 172.20.76.0/22
  priv19: 172.20.73.192/26
  priv1: 172.20.74.0/28
+  priv33: 172.20.74.16/28
  priv9: 172.20.74.32/28
  priv18: 172.20.74.48/28
  priv5: 172.20.74.64/28
@ -75,6 +76,7 @@ subnets-inet6:
    priv30: fd23:42:c3d2:5dd::/64
    priv31: fd23:42:c3d2:5de::/64
    priv32: fd23:42:c3d2:5df::/64
+    priv33: fd23:42:c3d2:5e0::/64
    c3d2: fd23:42:c3d2:523::/64
  up1:
    c3d2: 2a02:8106:208:5201::/64
@ -115,3 +117,4 @@ subnets-inet6:
    priv30: 2a02:8106:211:e9dd::/64
    priv31: 2a02:8106:211:e9de::/64
    priv32: 2a02:8106:211:e9df::/64
+    priv33: 2a02:8106:211:e9e0::/64
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@ -110,6 +110,7 @@ switches:
          - priv29
          - priv31
          - priv32
+          - priv33
          - iso1
          - iso2
          - iso3
@ -196,6 +197,7 @@ switches:
          - priv30
          - priv31
          - priv32
+          - priv33
      c3d2-server4:
        mode: bond
        group: 1
@ -546,6 +548,7 @@ switches:
          - priv29
          - priv31
          - priv32
+          - priv33
      up1:
        mode: access
        ports: '1'
@ -627,8 +630,8 @@ switches:
        vlans:
          - mgmt
          - pub
-          - c3d2
          - priv29
+          - priv33
      ap38:
        mode: trunk
        ports: 7
--- a/salt-pillar/vlans/init.sls
+++ b/salt-pillar/vlans/init.sls
@ -52,6 +52,7 @@ vlans:
  priv30: 69
  priv31: 70
  priv32: 71
+  priv33: 72
  # Isolated neighbors directly connection with their modems
  iso1: 101
  iso2: 102
--- a/subnets.md
+++ b/subnets.md
@ -12,7 +12,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
 * 172.20.73.192/26 PRIV19
 * 172.20.74.0/24:
  * 172.20.74.0/28 PRIV1
-  * 172.20.74.16/28 UNUSED
+  * 172.20.74.16/28 PRIV33
  * 172.20.74.32/28 PRIV9
  * 172.20.74.48/28 PRIV18
  * 172.20.74.64/28 PRIV5