deploy priv40

2 years ago · c8b518ef84
parent 94935a2db2
commit c8b518ef84
8 changed files with 102 additions and 43 deletions
--- a/contact.md.asc
+++ b/contact.md.asc
@ -1,46 +1,46 @@
 -----BEGIN PGP MESSAGE-----

-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
-=sQ7i
+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
+=AbIG
 -----END PGP MESSAGE-----
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@ -312,6 +312,22 @@ cpe:
        ssids:
          'ZW public':
            net: pub
+          'mino':
+            net: priv40
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf/WDPAfpFAdq7FgbD4VCg6t0I7MDHug1UTVcMXoxsA52kL
+              9UEPddnJWqpK/fdYGnu2AkVDis2DL8Y9Hje6MMFuV/Y9pNCu3d8FJRiw8DmyqDIt
+              aZF8GpKX20UgBLl/smwZAvfTfc6ocF7vN2alLoB9SW9qYpBFZuY1ZLkvTlo9raWN
+              k/RKsoCFW4tyGGJBFua10oAWE+zIEjFdVK8SrAI58mLJnHcblj6ubggJWEokBf7A
+              NPY0ZdRNKICL/qEzNRQ8qWs5MI7iMH2Yrtspx18eAG4+q6UgvGNYNUvQiSrebNnc
+              +kk+GHu1Vv6RILNC9Px+T33BnNXnpyzocEa4S3OTENJHAQYe/Q+Z149jeCFMNh7j
+              GxST14APGLAaUPq4F5I63jcaDa7LFBd2D7kv+iq3XF9Jaseq3Wv+qAPbj6bxVcPx
+              t9LOteUWIog=
+              =roDm
+              -----END PGP MESSAGE-----
+
  ap8:
    password: |
      -----BEGIN PGP MESSAGE-----
--- a/salt-pillar/dhcp/init.sls
+++ b/salt-pillar/dhcp/init.sls
@ -499,3 +499,15 @@ dhcp:
      routers: priv39-gw.priv39
    string-opts:
      domain-name: priv39.zentralwerk.org
+
+  priv40:
+    start: 172.20.77.66
+    end: 172.20.77.78
+    time: 120
+    max-time: 86400
+    opts:
+      domain-name-servers: "172.20.73.8, 9.9.9.9"
+    host-opts:
+      routers: priv40-gw.priv40
+    string-opts:
+      domain-name: priv40.zentralwerk.org
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@ -155,6 +155,7 @@ hosts-inet:
    priv37-gw: 172.20.72.51
    priv38-gw: 172.20.72.52
    priv39-gw: 172.20.72.60
+    priv40-gw: 172.20.72.61

  pub:
    pub-gw: 172.20.78.1
@ -410,6 +411,11 @@ hosts-inet:
 {%- for i in range(1, 14) %}
    dhcp{{ i }}: 172.20.77.{{ 1 + i }}
 {%- endfor %}
+  priv40:
+    priv40-gw: 172.20.77.65
+{%- for i in range(1, 14) %}
+    dhcp{{ i }}: 172.20.77.{{ 65 + i }}
+{%- endfor %}

  radio:
    radio-gw: 172.20.73.129
@ -555,6 +561,7 @@ hosts-inet6:
      priv37-gw: fd23:42:c3d2:581::c:24
      priv38-gw: fd23:42:c3d2:581::c:25
      priv39-gw: fd23:42:c3d2:581::c:26
+      priv40-gw: fd23:42:c3d2:581::c:27

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

@ -646,6 +653,8 @@ hosts-inet6:
      priv38-gw: fd23:42:c3d2:5e5::1
    priv39:
      priv39-gw: fd23:42:c3d2:5e6::1
+    priv40:
+      priv40-gw: fd23:42:c3d2:5e7::1

    radio:
      radio-gw: fd23:42:c3d2:586::1
@ -735,6 +744,7 @@ hosts-inet6:
      priv37-gw: 2a02:8106:211:e981::c:24
      priv38-gw: 2a02:8106:211:e981::c:25
      priv39-gw: 2a02:8106:211:e981::c:26
+      priv40-gw: 2a02:8106:211:e981::c:27

    radio:
      radio-gw: 2a02:8106:208:5286::1
@ -817,3 +827,5 @@ hosts-inet6:
      priv38-gw: 2a02:8106:211:e9e5::1
    priv39:
      priv39-gw: 2a02:8106:211:e9e5::1
+    priv40:
+      priv40-gw: 2a02:8106:211:e9e6::1
--- a/salt-pillar/lxc-containers/server1.sls
+++ b/salt-pillar/lxc-containers/server1.sls
@ -450,6 +450,17 @@ containers:
        type: phys
        hwaddr: 0A:14:48:01:2A:4B

+  priv40-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: upstream2
+        gw6: upstream2
+        hwaddr: 0A:14:48:01:2A:4C
+      priv40:
+        type: phys
+        hwaddr: 0A:14:48:01:2A:4D
+
  upstream1:
    interfaces:
      core:
--- a/salt-pillar/subnets/init.sls
+++ b/salt-pillar/subnets/init.sls
@ -40,6 +40,7 @@ subnets-inet:
  priv37: 172.20.76.128/28
  priv38: 172.20.76.192/28
  priv39: 172.20.77.0/28
+  priv40: 172.20.77.64/28
  c3d2: 172.22.99.0/24
  mgmt: 10.0.0.0/24
  priv17: 172.20.73.128/27
@ -89,6 +90,7 @@ subnets-inet6:
    priv37: fd23:42:c3d2:5e4::/64
    priv38: fd23:42:c3d2:5e5::/64
    priv39: fd23:42:c3d2:5e6::/64
+    priv40: fd23:42:c3d2:5e6::/64
    c3d2: fd23:42:c3d2:523::/64
  up1:
    c3d2: 2a02:8106:208:5201::/64
@ -136,3 +138,4 @@ subnets-inet6:
    priv37: 2a02:8106:211:e9e4::/64
    priv38: 2a02:8106:211:e9e5::/64
    priv39: 2a02:8106:211:e9e6::/64
+    priv40: 2a02:8106:211:e9e7::/64
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@ -148,6 +148,7 @@ switches:
          - priv16
          - priv21
          - priv38
+          - priv40
      server1:
        mode: bond
        group: 7
@ -209,6 +210,7 @@ switches:
          - priv37
          - priv38
          - priv39
+          - priv40
      c3d2-server4:
        mode: bond
        group: 1
@ -719,6 +721,7 @@ switches:
          - priv16
          - priv21
          - priv38
+          - priv40
      ap9:
        mode: trunk
        ports: 5
@ -741,6 +744,7 @@ switches:
        vlans:
          - mgmt
          - pub
+          - priv40
      ap22:
        mode: trunk
        ports: 2
--- a/subnets.md
+++ b/subnets.md
@ -50,6 +50,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
  * 172.20.76.192-172.20.76.207/28 PRIV38
 * 172.20.77.0-172.20.77.255/24 RESERVED
  * 172.20.77.0-172.20.77.31/28 PRIV39
+  * 172.20.77.64-172.20.77.79/28 PRIV40
 * 172.20.78.0-172.20.79.255/23 PUBLIC

 ## RFC 1918: non-routed