From 334b9f1f8e820919b43c170bf1381509a891672b Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 31 May 2021 01:11:18 +0200
Subject: [PATCH] switches: move priv40

---
 salt-pillar/cpe/aps.sls       | 30 +++++++++++++++---------------
 salt-pillar/switches/init.sls |  6 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index 54f851d..c2d4232 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -300,6 +300,21 @@ 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: |
@@ -801,21 +816,6 @@ cpe:
               a0A+Ovk=
               =PUn+
               -----END PGP MESSAGE-----
-          '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-----
 
   ap21:
     password: |
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index b80d5d8..a2b2f6b 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -116,7 +116,6 @@ switches:
           - priv34
           - priv36
           - priv37
-          - priv40
           - iso1
           - iso2
           - iso3
@@ -150,6 +149,7 @@ switches:
           - priv16
           - priv21
           - priv38
+          - priv40
       server1:
         mode: bond
         group: 7
@@ -603,7 +603,6 @@ switches:
           - priv34
           - priv36
           - priv37
-          - priv40
       up1:
         mode: access
         ports: '1'
@@ -679,7 +678,6 @@ switches:
           - mgmt
           - pub
           - priv26
-          - priv40
       ap26:
         mode: trunk
         ports: 18
@@ -735,6 +733,7 @@ switches:
           - priv16
           - priv21
           - priv38
+          - priv40
       ap9:
         mode: trunk
         ports: 5
@@ -757,6 +756,7 @@ switches:
         vlans:
           - mgmt
           - pub
+          - priv40
       ap22:
         mode: trunk
         ports: 2