From 2cde9ec315f33555544b3af212065318a22feb26 Mon Sep 17 00:00:00 2001
From: Tobias Schwarz <info@tobias-schwarz.com>
Date: Wed, 28 Aug 2024 08:53:18 +0000
Subject: [PATCH] j41: additional antenna

---
 locations/j41.yml | 52 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/locations/j41.yml b/locations/j41.yml
index bbf21d587..6bb41b509 100644
--- a/locations/j41.yml
+++ b/locations/j41.yml
@@ -1,6 +1,6 @@
 ---
 location: j41
-location_nice: Jessnerstraße 41
+location_nice: Jessnerstraße 41, 10247 Berlin
 latitude: 52.51047588
 longitude: 13.47179912
 altitude: 58
@@ -12,12 +12,16 @@ hosts:
     model: "avm_fritzbox-7530"
     wireless_profile: freifunk_default
 
+  - hostname: j41-nw-5ghz
+    role: ap
+    model: "ubnt_bullet-m5-ar7241"
+
 snmp_devices:
   - hostname: j41-switch
     address: 10.31.41.2
     snmp_profile: edgeswitch
 
-  - hostname: j41-f2a
+  - hostname: j41-spitta13
     address: 10.31.41.3
     snmp_profile: airos_6
 
@@ -34,21 +38,44 @@ ipv6_prefix: "2001:bf7:830:bd00::/56"
 # --DHCP: 10.31.41.128/25
 
 networks:
+  # MESH - Spitta13
   - vid: 10
     role: mesh
-    name: mesh_f2a
+    name: mesh_spitta13
     prefix: 10.31.41.66/32
     ipv6_subprefix: -10
-    mesh_metric: 1024
-    mesh_metric_lqm: ['default 0.3']
     ptp: true
 
+  # MESH - Zwingli
   - vid: 11
     role: mesh
     name: mesh_zwingli
     prefix: 10.31.41.67/32
     ipv6_subprefix: -11
 
+  # MESH - 5 GHz 802.11s
+  - vid: 20
+    role: mesh
+    name: mesh_11s_nw
+    prefix: 10.31.41.68/32
+    ipv6_subprefix: -20
+    mesh_ap: j41-nw-5ghz
+    mesh_radio: 11a_standard
+    mesh_iface: mesh
+    mesh_metric: 1024
+    mesh_metric_lqm: ['default 0.3']
+
+  # DHCP with filtering and isolation
+  - vid: 40
+    role: dhcp
+    prefix: 10.31.41.128/25
+    ipv6_subprefix: 0
+    inbound_filtering: true
+    enforce_client_isolation: true
+    assignments:
+      j41-core: 1
+
+  # MGMT
   - vid: 42
     role: mgmt
     prefix: 10.31.41.0/27
@@ -58,20 +85,13 @@ networks:
     assignments:
       j41-core: 1
       j41-switch: 2
-      j41-f2a: 3
+      j41-spitta13: 3
       j41-zwingli: 4
-
-  - vid: 40
-    role: dhcp
-    prefix: 10.31.41.128/25
-    ipv6_subprefix: 0
-    inbound_filtering: true
-    enforce_client_isolation: true
-    assignments:
-      j41-core: 1
+      j41-nw-5ghz: 5
 
 location__channel_assignments_11g_standard__to_merge:
   j41-core: 13-20
 
 location__channel_assignments_11a_standard__to_merge:
-  j41-core: 36-40
+  j41-core: 44-40
+  j41-nw-5ghz: 36-40