From 0002456abfa0f34528a87a5171bb08c27fd41b98 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 16 Sep 2022 18:57:16 +0200
Subject: [PATCH] options, saal aps: turn ZW public back to no encryption, add
 ssid Datenspuren for owe

---
 config/ap.nix              | 40 +++++++++++++++++++++++---------------
 nix/lib/config/options.nix |  2 +-
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/config/ap.nix b/config/ap.nix
index e13b63a..04204d2 100644
--- a/config/ap.nix
+++ b/config/ap.nix
@@ -1150,7 +1150,7 @@
           channel = 1;
           htmode = "HT20";
           ssids = {
-            "ZW public legacy" = { net = "pub"; encryption = "none"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
             "ZW stage legacy" = { net = "priv25"; };
           };
         };
@@ -1158,7 +1158,8 @@
           channel = 36;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
+            "Datenspuren" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1187,7 +1188,7 @@
           channel = 5;
           htmode = "HT20";
           ssids = {
-            "ZW public legacy" = { net = "pub"; encryption = "none"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
             "ZW stage legacy" = { net = "priv25"; };
           };
         };
@@ -1195,7 +1196,8 @@
           channel = 149;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
+            "Datenspuren" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1226,7 +1228,7 @@
           htmode = "HT20";
           ssids = {
             EWW = { net = "priv36"; };
-            "ZW public legacy" = { net = "pub"; encryption = "none"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
             "ZW stage legacy" = { net = "priv25"; };
           };
         };
@@ -1235,7 +1237,8 @@
           htmode = "VHT80";
           ssids = {
             EWW = { net = "priv36"; };
-            "ZW public" = { net = "pub"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
+            "Datenspuren" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1264,7 +1267,7 @@
           channel = 1;
           htmode = "HT20";
           ssids = {
-            "ZW public legacy" = { net = "pub"; encryption = "none"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
             "ZW stage legacy" = { net = "priv25"; };
           };
         };
@@ -1272,7 +1275,8 @@
           channel = 149;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
+            "Datenspuren" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1301,7 +1305,7 @@
           channel = 5;
           htmode = "HT20";
           ssids = {
-            "ZW public legacy" = { net = "pub"; encryption = "none"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
             "ZW stage legacy" = { net = "priv25"; };
           };
         };
@@ -1309,7 +1313,8 @@
           channel = 36;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
+            "Datenspuren" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1338,7 +1343,7 @@
           channel = 9;
           htmode = "HT20";
           ssids = {
-            "ZW public legacy" = { net = "pub"; encryption = "none"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
             "ZW stage legacy" = { net = "priv25"; };
           };
         };
@@ -1346,7 +1351,8 @@
           channel = 149;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
+            "Datenspuren" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1408,7 +1414,7 @@
           channel = 1;
           htmode = "HT20";
           ssids = {
-            "ZW public legacy" = { net = "pub";  encryption = "none"; };
+            "ZW public" = { net = "pub";  encryption = "none"; };
             "ZW stage legacy" = { net = "priv25"; };
             gerdwork = { net = "priv32"; };
           };
@@ -1417,7 +1423,8 @@
           channel = 36;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
+            "Datenspuren" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
@@ -1486,7 +1493,7 @@
           channel = 9;
           htmode = "HT20";
           ssids = {
-            "ZW public legacy" = { net = "pub"; encryption = "none"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
             "ZW stage legacy" = { net = "priv25"; };
           };
         };
@@ -1494,7 +1501,8 @@
           channel = 149;
           htmode = "VHT80";
           ssids = {
-            "ZW public" = { net = "pub"; };
+            "ZW public" = { net = "pub"; encryption = "none"; };
+            "Datenspuren" = { net = "pub"; encryption = "owe"; };
             "ZW stage" = { net = "priv25"; };
           };
         };
diff --git a/nix/lib/config/options.nix b/nix/lib/config/options.nix
index 5337841..a0ad19e 100644
--- a/nix/lib/config/options.nix
+++ b/nix/lib/config/options.nix
@@ -455,7 +455,7 @@ let
                       type = enum [ "none" "owe" "wpa2" "wpa3" ];
                       default =
                         if config.psk == null
-                        then "owe"
+                        then "none"
                         else "wpa3";
                     };
                     mode = mkOption {