Merge branch 'master' into rm-ak36-friedenau

pktpls · Apr 29, 2024 · bedfa0b · bedfa0b
2 parents b70aa1e + 3c0b681
commit bedfa0b
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/locations/newyorck.yml b/locations/newyorck.yml
@@ -11,7 +11,6 @@ contacts:
 role: ap
 model: "siemens_ws-ap3610"
 wireless_profile: newyorck
-wifi_roaming: true
 
 hosts:
 
@@ -161,9 +160,6 @@ location__wireless_profiles__to_merge:
       - radio: 11g_standard
         legacy_rates: false
         country: DE
-      - radio: 11a_mesh
-        legacy_rates: false
-        country: DE
 
     ifaces:
       - mode: ap
@@ -172,26 +168,19 @@ location__wireless_profiles__to_merge:
         network: dhcp
         radio: [11a_standard, 11g_standard]
         ifname_hint: ff
-        owe_transition_ifname_hint: ffowe
+
       - mode: ap
-        ssid: berlin.freifunk.net OWE
-        hidden: true
+        ssid: berlin.freifunk.net Encrypted
         encryption: owe
         network: dhcp
         radio: [11a_standard, 11g_standard]
         ifname_hint: ffowe
-        owe_transition_ifname_hint: ff
         ieee80211w: 1
+
       - mode: ap
         ssid: newyorck
         encryption: psk2
         key: 'file:/root/wifi_pass'
         network: prdhcp
         radio: [11a_standard, 11g_standard]
         ifname_hint: prdhcp
-      - mode: mesh
-        mesh_id: Mesh-Freifunk-Berlin
-        radio: [11a_standard, 11g_standard, 11a_mesh]
-        mcast_rate: 12000
-        mesh_fwding: 0
-        ifname_hint: mesh