deploy priv15 + priv16

contact.md.asc

@@ -1,35 +1,36 @@
 -----BEGIN PGP MESSAGE-----
 
-hQEMA2PKcvDMvlKLAQf/YSF2MaDbDX1DC+fq/VkgOEXcWTulXRrfoqtppyWLeX48
-pQDbS+OxFXv30AYQVrwemKuGdV2eJdtkCbUrsR0aesJdwB6NDMO91u6f4F8lTWk8
-6X4G5S08GKKd6iwZbfoAYa5yxpyfLkRzL0V/IRlUqVCinX/bSh3SoljdZGsmTJ9P
-h4RYR6dsTkilcfFfnNVW7tm13zNncM8DZxPWbNRTrJHrJb5XFahs19TsbfrMOnkf
-IP0ul4yrGqeohUJgjbZpcKKaYj+8SyJV7nPOf+JI1hCE6eCToDXrYUSEaUmyuTwa
-StpR+xrkxNJwobb9GlMh+/C30aXtETITdA+l3ydGVtLqAfTAIHsidzOcpp4iD0uR
-KhWVPXGZVZVTAV7uGN0E+ir5Turk7LsEA0uVgxl7vd7B820KX7AjymrxiiJCK/pJ
-wZcJAbUSWBZVfCYExoiqMgdd/usl4sQEpWCcoRPwJ0+qqLr6uuTkGgUA3i1bUqIl
-xxCtcREFQuxy18/MdM5es6XM+uXBkCJIyLCkvwwVlQjGu6xwcW89tmOxeu1heIwU
-tJLfrHDWjCFma4CD6H35KwWyL432VFUnFjh7RcjwKN87y4tFyHAA5AbpvFlVfwjH
-rqnHBka41aSqOJYziCzqEmYdIrwAAjU72o3naVVRQ/221RM2OL+JXrwe0HzJFMTt
-Sc99bVUAycNp5wNWlKs7oYYBp2uE2XdtEwbucjQsdLoCDNtIfMD6HgoiTC0WLNOd
-KFN+Ud3OiALWvzxyQ/JGYmGApyGubdGaoHUqVZNJ9Q22EQZuJJP6oshRyeQ9UurN
-N5BH901xQcQY5z5oxDrPCYUAHyywvxUJaClixsgweJNP9n2DolHEGYxb99h6O001
-yLRXglpTdjxl5kU8hiJMcqz1BKxHf2gt1rWVVZMHJuUiRWxYr+V302in0GOpdzuF
-gMLKgGUij4hY3RQdFXJzIEdVIAqjuHI4HXcs5LRJjybNqx0fnszE/v8nV7LszrJK
-3aYu5qJ5fwO0KRTO/SfoX4bNve/o7tPagjJROpjXmEKRHaWnYOGNZSD6IKLsy06S
-l1mCH9StWlCT16Jc6w/QI5FkvqSpW2erlM1j5IlQGGb1Cp2bQqh8fZ4nz2wvXng+
-kqDp+IT/O8MMVoDqOyRfhv7MPr67CcU43SZ6KMNux+Za7uIso0//MLV9jzQfe5jW
-pB59yLo5LATcF1aKQTIOjyE6Vrw5Zt99Cd1aTfms4o4+XuvomDoqTtbFs/SPBj26
-6sMqRmR5apOoS1zcqXyKlw9V2v45xi8xChUEclRwkY/n3ZMzRm91c0K1Usgx0aSq
-+csUz+hjgZ0yL3+Sig91xlYahieAw8TSKupYXoGDAtVtVZnH0dqLxjtqKklHFr9c
-kPF4/KiZ5hXH1VqTP2zv46Wt/Wvvt4pTRkXygDGTdWdr0jDrHl+VEQuh+jCRgyaE
-cI6hmvKpwNyzfWbO8olpA5GxmcwPu4bhsGGRd3KJAVaB9fjphk5oFhhQ90c4dX0/
-rWzc207KVmLUL0iYmEFTG4O8PmeFOUWtUbdMMLiwakr5josJCk0S4uw+gH3eFoO/
-xvdy3tjeCgtYfq5eSbMVeh4xyoWYCkk4jx9WwVony2bpSK+Rm+pjRXP+qzIVR9kG
-e/A/f0bX0/8wpXfheonqOQDKpMkW3/DD4R0gmiIWyq0KGThOmJtLDrpVP6+ET/xC
-zJv9MCef32FS5tA53yuAPkXp2H66+7zX1Aofb6XRfEz+jJ95kIxcv8FAjtRAwke6
-4poHQABwohoFpxdGEx6y+iiAFRMQvllIzhzfuVllIl8LtsSZexzVJeybsGpDVMFO
-G2iYJaVyI5a2pkrMNakJI4ckIi3H60pgPhDSs9bESTAVniib6o2fF46Yq0wYYa8p
-XVQMaFev8OP4AqyHFA==
-=fqgY
+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
+=C+b6
 -----END PGP MESSAGE-----

salt-pillar/cpe/aps.sls

@@ -424,6 +424,22 @@ cpe:
         ssids:
           'ZW public':
             net: pub
+          'Herzzbuehne':
+            net: priv16
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf+MX9YP8AE1LCPvzz+OEO2uc8lzWWoS5+3C76VAydTvKCY
+              vHtGt+U+mrngsxQ9jzJEvEiZo2d/ShTNvN+/x6ByngSB1eGMtsja0a8ioQxcUW5m
+              DV+Gj3+Uau5EAcrdM95Nt1rRvSqHHyyCczCArBWD3y8vuTXt3gSClC+aI8I8Mn7U
+              tol7RRBpFHd2XZAQ4ZgzRXcLsG2WSx7cdQBr0QYq/EdfJltAF9zQ+ixkMUnumEz5
+              m74wwJqNAjLMNyy03wpZEESzNwjlvyuswAEwNt3F3DFn+ugNfErBUasFPiK8Dvcv
+              LLL9J5mjaWTzXNkx9hzEZUfxhrxGZtfl0k4mcXX7CdJHARHFrC6ID8HSDQYZhr8m
+              GcNW8jG9RU+Uytj5dlsJotaVaj1U7OMTPebzT3jN5TMTdTuQBxWp9u2MOFgSJQLM
+              o2Zk+iNuyVA=
+              =4fHK
+              -----END PGP MESSAGE-----
+
   ap10:
     password: |
       -----BEGIN PGP MESSAGE-----
@@ -449,6 +465,21 @@ cpe:
         ssids:
           'ZW public':
             net: pub
+          'iz-dresden.org':
+            net: priv15
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf/crEJm7A1i9PaPCKuZK+07Vm0uax71xsgNwiUYst1EkQZ
+              MGPi2VvESjmBfiZieZ+bC6iofMHB2U/jMyr3X9bl6o1pwPm1Shsn9pBxf75iG8xt
+              ENDuXyP8+vOVdsOU0liZuWhxQqfwf8XdUcz4fGXUYNl9bEVw8MK8qywOLjjLPKjq
+              4AtIrUjpLAF2QUlsWR2nhd/u5CGJ2pA82WXC6NrnlAFJjMeU7DLG1d6efdbnYAjY
+              wiTmguXCnGRFNY5Th8TK5Ra0aO94nXb1luv5iSyK5r5VfXW2kkS6yHJ80/C8miM/
+              eqo/e8t54jjBoepG/3mN13sk9fHl9N+8bdDIX8XqJdJEAbBfLWOY07fpR3Kg3sU2
+              6sDSssbV9iY/PhJrbTVExeb3dCiWRKsrxQphEgXc6oD5ywnCUs3ru7oTPU2gh6WV
+              u8ztziA=
+              =xY9t
+              -----END PGP MESSAGE-----
 
   ap11:
     password: |

salt-pillar/dhcp/init.sls

@@ -192,6 +192,30 @@ dhcp:
     string-opts:
       domain-name: priv14.zentralwerk.org
 
+  priv15:
+    start: 172.20.75.162
+    end: 172.20.75.174
+    time: 120
+    max-time: 86400
+    opts:
+    host-opts:
+      routers: priv15-gw.priv15
+      domain-name-servers: upstream2.core
+    string-opts:
+      domain-name: priv15.zentralwerk.org
+
+  priv16:
+    start: 172.20.75.226
+    end: 172.20.75.238
+    time: 120
+    max-time: 86400
+    opts:
+    host-opts:
+      routers: priv16-gw.priv16
+      domain-name-servers: upstream2.core
+    string-opts:
+      domain-name: priv16.zentralwerk.org
+
   radio:
     start: 172.20.73.130
     end: 172.20.73.190

salt-pillar/lxc-containers/server1.sls

@@ -175,6 +175,28 @@ containers:
         type: phys
         hwaddr: 0A:14:48:01:2A:13
 
+  priv15-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: anon1
+        gw6: anon1
+        hwaddr: 0A:14:48:01:2A:14
+      priv15:
+        type: phys
+        hwaddr: 0A:14:48:01:2A:15
+
+  priv16-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: anon1
+        gw6: anon1
+        hwaddr: 0A:14:48:01:2A:16
+      priv16:
+        type: phys
+        hwaddr: 0A:14:48:01:2A:17
+
   upstream1:
     interfaces:
       core:

salt-pillar/switches/init.sls

@@ -574,12 +574,14 @@ switches:
         vlans:
           - mgmt
           - pub
+          - priv16
       ap10:
         mode: trunk
         ports: 4
         vlans:
           - mgmt
           - pub
+          - priv15
       ap7:
         mode: trunk
         # Turm D, 5. Etage