From 51522c28dc2bac39a303447b122b3cf1b5278b16 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 3 Feb 2021 00:37:29 +0100
Subject: [PATCH] aps: set locations, add priv32, add ap52

---
 salt-pillar/cpe/aps.sls | 88 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 82 insertions(+), 6 deletions(-)

diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index 01c4ede..1477497 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -1946,7 +1946,7 @@ cpe:
       -----END PGP MESSAGE-----
     model: Ubnt-UAP-nanoHD
     version: release
-    location: "Saal"
+    location: "Saal A vorn"
     radios:
       '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
         channel: 1
@@ -2007,7 +2007,7 @@ cpe:
       -----END PGP MESSAGE-----
     model: Ubnt-UAP-nanoHD
     version: release
-    location: "Saal"
+    location: "Saal A mitte"
     radios:
       '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
         channel: 5
@@ -2068,7 +2068,7 @@ cpe:
       -----END PGP MESSAGE-----
     model: Ubnt-UAP-nanoHD
     version: release
-    location: "Saal"
+    location: "Saal A hinten"
     radios:
       '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
         channel: 9
@@ -2190,7 +2190,7 @@ cpe:
       -----END PGP MESSAGE-----
     model: Ubnt-UAP-nanoHD
     version: release
-    location: "Saal"
+    location: "Saal A Kleiner Saal Tuer"
     radios:
       '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
         channel: 5
@@ -2251,7 +2251,7 @@ cpe:
       -----END PGP MESSAGE-----
     model: Ubnt-UAP-nanoHD
     version: release
-    location: "Saal"
+    location: "Saal A Kabinett"
     radios:
       '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
         channel: 9
@@ -2312,7 +2312,7 @@ cpe:
       -----END PGP MESSAGE-----
     model: Ubnt-UAP-nanoHD
     version: release
-    location: "Saal"
+    location: "Saal A Kleiner Saal Buehne"
     radios:
       '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
         channel: 1
@@ -2335,6 +2335,21 @@ cpe:
               s6mIfpkpSQlOMA==
               =3suQ
               -----END PGP MESSAGE-----
+          'gerdworks':
+            net: priv32
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf+KnHr0krmQBne68301rPb/y3Gi67+Badeio5brQo+C6w2
+              Gu26iLA1gbgDijMk/1G7pSiSi30OpbkPP0miUraetpgRX3X7ulhSz4gMJAAhgiEx
+              vv3lF9AVWvQb+nJGw8tEMqvfdm6x9w6DpB6L+/AkpCpPsxRhTaPs1rYnmUt2iRpr
+              CHtoRvtaFmk7KKdtT3fCL28ZE/ZjihHyJ2Ec3yFm4bIERRKKgl7BxitUGzTq5K5f
+              mV8eY4xfMAASwMT6xkh3Q22jESKUZGENpEf5tkDY83zq2kYzJXTs2E/oG6w+Hm+P
+              N9NgCTJJvzflRjBBrkKIhLJ9EVQ9QiFtYKbS125OotJDAayGKuZiDLH23noSi7bW
+              2J1h1WbnndrZXVg4//eqnNk4Q3Hjaw/Cen9uD1tykhxIByI1e7uVRJ5P+S6aJ4UX
+              2QASkw==
+              =a17B
+              -----END PGP MESSAGE-----
       '1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0':
         channel: 36
         htmode: VHT80
@@ -2421,3 +2436,64 @@ cpe:
               -----END PGP MESSAGE-----
 
 
+  ap52:
+    firstboot: True
+    password: |
+      -----BEGIN PGP MESSAGE-----
+      
+      hQEMA2PKcvDMvlKLAQf8C0p0fJEIiib95aBMAdrAsvlDm1VBYEgDbdkhIL+ERTkc
+      JCC+xJQ/fE7iIrhgKBr3oShMMp0mZ5fdDP35Q59pw7D2Ux0x9t2srvJ/oJlEIpfR
+      cYq6m0GxtuJuZCqNXpzlJfM1CCJx07Gxz+jRTHoifrQwtIz6GZdBt126whrf0A+y
+      JqnSGCZ4FHr8Traa7X3npFT2ZnAsM5LmukXd1KZsqEC9VM/B0Gj+dxea5SvHB52b
+      ErGP3BUa5a1tIj5psgH6QPP2Fx4qvsxCfMY7VEpLb8tJuaCpjjek4gsg6CLUBpqb
+      Boe5mB/7WZFDa9z4YUWtlBz1tDtSEHLatQnHJwVWS9JFAQ3Aafj8cTsFy6fJtpH1
+      5PtxztRrr/asqM01wKy0NtN1jDiGKAOomdsxqZFpLnguxbvZ2T2/HLwzun0Mlv+o
+      SRWSVEnm
+      =PSjs
+      -----END PGP MESSAGE-----
+    model: Ubnt-UAP-nanoHD
+    version: release
+    location: "Saal (TODO)"
+    radios:
+      '1e140000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0':
+        channel: 9
+        htmode: HT20
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage legacy':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----
+      '1e140000.pcie/pci0000:00/0000:00:01.0/0000:02:00.0':
+        channel: 149
+        htmode: VHT80
+        ssids:
+          'ZW public':
+            net: pub
+          'ZW stage':
+            net: priv25
+            psk: |
+              -----BEGIN PGP MESSAGE-----
+              
+              hQEMA2PKcvDMvlKLAQf8CB8ztr4Mf4m0b11ttFdt/I2RJMHXAqjkmxk+qWmnPWAP
+              0joPqTPvy5PgEooVr7RVLIg3Zs9/xtveJuZ3ooPy76oavjTk9OMl58tnfGoM1n3t
+              ISC052UzzKN4yQ1uJEK6htILPp+DmlN3f/FcTbIsGA3tqFBFQn4hCXg8puWTH+e+
+              bMxTAkAKy/W5ZNEu2y6pTUVZpqifl8ejWYFi4JYiLwWE0CexeqO/Jh2rqeFO60XB
+              CMJr3YiFg3wbfjJv9YqunXRC0i4vtAQSn1FHyHo9Xl73jyogfBZ0lG8xJA5vH7Lm
+              AjVVweZN1BryYh9U8M65ZQPxBTsfOShkl0jC4h8wlNJJAcHri4oph5/O/71TwY0h
+              AddhubgGQecOn/g+lQsBYPwIZKxiVjs6OoaO7VSc/8z5IMuBrq8BPa9kHNLmgnek
+              s6mIfpkpSQlOMA==
+              =3suQ
+              -----END PGP MESSAGE-----