From 3f441fd54e1da61ec186989475b8ca40b6f2b35c Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 16 Sep 2022 20:15:13 +0200
Subject: [PATCH] ap: merge ssid Datenspuren into ZW public again

---
 config/ap.nix | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/config/ap.nix b/config/ap.nix
index 1dee95f..39e5dc4 100644
--- a/config/ap.nix
+++ b/config/ap.nix
@@ -1158,8 +1158,7 @@
           channel = 36;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; encryption = "none"; };
-            "Datenspuren" = { net = "pub"; encryption = "owe"; ifname = "wlan5-owe"; };
+            "ZW public" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1196,8 +1195,7 @@
           channel = 149;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; encryption = "none"; };
-            "Datenspuren" = { net = "pub"; encryption = "owe"; ifname = "wlan5-owe"; };
+            "ZW public" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1237,8 +1235,7 @@
           htmode = "VHT80";
           ssids = {
             EWW = { net = "priv36"; };
-            "ZW public" = { net = "pub"; encryption = "none"; };
-            "Datenspuren" = { net = "pub"; encryption = "owe"; ifname = "wlan5-owe"; };
+            "ZW public" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1275,8 +1272,7 @@
           channel = 149;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; encryption = "none"; };
-            "Datenspuren" = { net = "pub"; encryption = "owe"; ifname = "wlan5-owe"; };
+            "ZW public" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1313,8 +1309,7 @@
           channel = 36;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; encryption = "none"; };
-            "Datenspuren" = { net = "pub"; encryption = "owe"; ifname = "wlan5-owe"; };
+            "ZW public" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1351,8 +1346,7 @@
           channel = 149;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; encryption = "none"; };
-            "Datenspuren" = { net = "pub"; encryption = "owe"; ifname = "wlan5-owe"; };
+            "ZW public" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1414,7 +1408,7 @@
           channel = 1;
           htmode = "HT20";
           ssids = {
-            "ZW public legacy" = { net = "pub";  encryption = "none"; };
+            "ZW public legacy" = { net = "pub"; encryption = "none"; };
             "ZW stage legacy" = { net = "priv25"; };
             gerdwork = { net = "priv32"; };
           };
@@ -1423,8 +1417,7 @@
           channel = 36;
           htmode = "VHT80";
           ssids = {
-            "ZW public legacy" = { net = "pub"; encryption = "none"; };
-            "Datenspuren" = { net = "pub"; encryption = "owe"; ifname = "wlan5-owe"; };
+            "ZW public" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1501,8 +1494,7 @@
           channel = 149;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; encryption = "none"; };
-            "Datenspuren" = { net = "pub"; encryption = "owe"; ifname = "wlan5-owe"; };
+            "ZW public" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };