teufelsberg: add 2 new aps replacing 1

freifunk-berlin · Oct 26, 2024 · ee642b4 · ee642b4
1 parent 139dc20
commit ee642b4
Showing 1 changed file with 13 additions and 48 deletions.
diff --git a/locations/teufelsberg.yml b/locations/teufelsberg.yml
@@ -23,22 +23,14 @@ hosts:
     host__packages__to_merge:
       - "kmod-usb-ohci usbip-server usbip-client"
 
-  # - hostname: teufelsberg-ap1
-  #   role: ap
-  #   model: mikrotik_sxtsq-5-ac
-  #   mac_override: {eth0: dc:2c:6e:91:08:19}
-  #   wireless_profile: freifunk_default
-
-  # - hostname: teufelsberg-ap2
-  #   role: ap
-  #   model: mikrotik_sxtsq-5-ac
-  #   mac_override: {eth0: dc:2c:6e:91:0f:66}
-  #   wireless_profile: freifunk_default
-
-  - hostname: teufelsberg-ap3
+  - hostname: teufelsberg-ap1
     role: ap
-    model: mikrotik_sxtsq-5-ac
-    mac_override: {eth0: 2c:c8:1b:6a:ce:f1}
+    model: cudy_ap3000outdoor-v1
+    wireless_profile: freifunk_default
+
+  - hostname: teufelsberg-ap2
+    role: ap
+    model: cudy_ap3000outdoor-v1
     wireless_profile: freifunk_default
 
   - hostname: teufelsberg-ap4
@@ -127,33 +119,6 @@ networks:
     prefix: 10.31.213.69/32
     ipv6_subprefix: -15
 
-  # - vid: 20
-  #   role: mesh
-  #   name: mesh_ap1
-  #   prefix: 10.31.213.74/32
-  #   ipv6_subprefix: -20
-  #   mesh_ap: teufelsberg-ap1
-  #   mesh_radio: 11a_standard
-  #   mesh_iface: mesh
-
-  # - vid: 21
-  #   role: mesh
-  #   name: mesh_ap2
-  #   prefix: 10.31.213.75/32
-  #   ipv6_subprefix: -21
-  #   mesh_ap: teufelsberg-ap2
-  #   mesh_radio: 11a_standard
-  #   mesh_iface: mesh
-
-  - vid: 22
-    role: mesh
-    name: mesh_ap3
-    prefix: 10.31.213.76/32
-    ipv6_subprefix: -22
-    mesh_ap: teufelsberg-ap3
-    mesh_radio: 11a_standard
-    mesh_iface: mesh
-
   - vid: 23
     role: mesh
     name: mesh_ap4
@@ -181,10 +146,10 @@ networks:
     assignments:
       teufelsberg-core: 1
       teufelsberg-switch: 2
-      # teufelsberg-ap1: 3
-      # teufelsberg-ap2: 4
-      teufelsberg-ap3: 5  # pointing south
-      teufelsberg-ap4: 6  # point down
+      teufelsberg-ap1: 3
+      teufelsberg-ap2: 4
+      # teufelsberg-ap3: 5
+      teufelsberg-ap4: 6
       teufelsberg-ak36: 7
       teufelsberg-ilr: 8
       teufelsberg-nw: 10
@@ -193,7 +158,7 @@ networks:
       teufelsberg-cam: 13
 
 location__channel_assignments_11a_standard__to_merge:
-  # teufelsberg-ap1: 44-20
-  # teufelsberg-ap2: 48-20
+  teufelsberg-ap1: 44-20
+  teufelsberg-ap2: 48-20
   teufelsberg-ap3: 36-20
   teufelsberg-ap4: 40-20