k11, k12, hirschhof: bring some order into the setup

locations/hirschhof.yml

@@ -16,7 +16,6 @@ hosts:
   - hostname: hirschhof-k12
     role: ap
     model: "tplink_cpe210-v1"
-    wireless_profile: freifunk_default
     wifi_roaming: true
 
 ipv6_prefix: '2001:bf7:760:2c00::/56'

locations/k12-haus3.yml → locations/k12-h1-h3n.yml

@@ -1,28 +1,25 @@
 ---
-location: k12-haus3
-location_nice: 'Haus 3, Kastanienallee 12, 10435 Berlin'
-latitude: 52.53951094884286
-longitude: 13.409447813490967
+location: k12-h1-h3n
+location_nice: 'Haus1, Kastanienallee 12, 10435 Berlin'
+latitude: 52.539219578693945
+longitude: 13.409907836874728
 contact_nickname: 'zander'
 contacts:
   - 'alexanderjabs@gmx.de'
 
 hosts:
-  - hostname: k12-haus3-core
+  - hostname: k12-h1-h3n
     role: corerouter
     model: "dlink_dap-x1860-a1"
     wireless_profile: freifunk_default
-    host__rclocal__to_merge:
-      # Add service announcement for K12 Sunset Webcam
-      - "[ -z \"$(uci show olsrd | grep -F 'k12-sunset.olsr')\" ] && uci add_list olsrd.@LoadPlugin[1].service=\"http://k12-sunset.olsr:80|tcp|K12 Sunset Webcam\" && /etc/init.d/olsrd restart"
 
-ipv6_prefix: '2001:bf7:760:700::/56'
+ipv6_prefix: '2001:bf7:760:2e00::/56'
 
 # got following prefixes:
-# Router: 10.31.226.192/26
-# --MGMT: 10.31.226.192/28
-# --MESH: 10.31.226.208/28
-# --DHCP: 10.31.226.224/27
+# Router: 10.248.19.192/26
+# --MGMT: 10.248.19.224/28
+# --MESH: 10.248.19.240/28
+# --DHCP: 10.248.19.192/27
 
 # Disable noping
 dhcp_no_ping: false
@@ -31,56 +28,53 @@ networks:
   # MESH - 5 GHz 802.11s
   - vid: 20
     role: mesh
-    name: mesh_5g
-    prefix: 10.31.226.209/32
+    name: mesh_core_5g
+    prefix: 10.248.19.240/32
     ipv6_subprefix: -20
-    mesh_ap: k12-haus3-core
+    mesh_ap: k12-h1-h3n
     mesh_radio: 11a_standard
     mesh_iface: mesh
 
   # MESH - 2.4 GHz 802.11s
   - vid: 21
     role: mesh
-    name: mesh_2g
-    prefix: 10.31.226.210/32
+    name: mesh_core_2g
+    prefix: 10.248.19.241/32
     ipv6_subprefix: -21
     # make mesh_metric(s) for 2GHz worse than 5GHz
     mesh_metric: 1024
     mesh_metric_lqm: ['default 0.8']
-    mesh_ap: k12-haus3-core
+    mesh_ap: k12-h1-h3n
     mesh_radio: 11g_standard
     mesh_iface: mesh
 
   # DHCP with filtering and isolation
   - vid: 40
     role: dhcp
-    untagged: true
     inbound_filtering: true
     enforce_client_isolation: true
-    prefix: 10.31.226.224/27
+    prefix: 10.248.19.192/27
     ipv6_subprefix: 0
     assignments:
-      k12-haus3-core: 1
+      k12-h1-h3n: 1
 
   # MGMT
   - vid: 42
     role: mgmt
-    untagged: true
-    prefix: 10.31.226.192/28
+    prefix: 10.248.19.224/28
     gateway: 1
     dns: 1
     ipv6_subprefix: 1
     assignments:
-      k12-haus3-core: 1  # 10.31.226.193
-      k12-sunset: 2      # 10.31.226.194
+      k12-h1-h3n: 1  # 10.248.19.225
 
 # AP-id, wifi-channel, bandwidth, txpower
 location__channel_assignments_11a_standard__to_merge:
-  k12-haus3-core: 36-40
+  k12-h1-h3n: 36-40
 
 # AP-id, wifi-channel, bandwidth, txpower
 location__channel_assignments_11g_standard__to_merge:
-  k12-haus3-core: 13-20
+  k12-h1-h3n: 13-20
 
 dns_servers:
   # quad9

locations/k12-haus1.yml → locations/k12-h1.yml

@@ -1,28 +1,17 @@
 ---
-location: k12-haus1
+location: k12-h1
 location_nice: 'Kastanienallee 12, Haus 1'
-latitude: 52.539219578693945
-longitude: 13.409907836874728
+latitude: 52.539199815
+longitude: 13.410111666
 contact_nickname: 'zander'
 contacts:
   - 'alexanderjabs@gmx.de'
 
-dns_servers:
-  # quad9
-  - 9.9.9.9
-  - 149.112.112.112
-  - 2620:fe::fe
-  - 2620:fe::9
-  # cloudflare
-  - 1.1.1.1
-  - 1.0.0.1
-  - 2606:4700:4700::1111
-  - 2606:4700:4700::1001
-
 hosts:
-  - hostname: k12-haus1-core
+  - hostname: k12-h1-core
     role: corerouter
-    model: "dlink_dap-x1860-a1"
+    model: "dlink_covr-x1860-a1"
+    mac_override: {eth0: a8:63:7d:db:4d:4c}
     wireless_profile: freifunk_default
 
 ipv6_prefix: '2001:bf7:760:300::/56'
@@ -37,40 +26,48 @@ ipv6_prefix: '2001:bf7:760:300::/56'
 dhcp_no_ping: false
 
 networks:
-  # DHCP with filtering and isolation
-  - vid: 40
-    role: dhcp
-    untagged: true
-    inbound_filtering: true
-    enforce_client_isolation: true
-    prefix: 10.31.226.160/27
-    ipv6_subprefix: 0
-    assignments:
-      k12-haus1-core: 1
-
   # MESH - 5 GHz 802.11s
   - vid: 20
     role: mesh
-    name: mesh_5g
+    name: mesh_core_5g
     prefix: 10.31.226.145/32
     ipv6_subprefix: -20
-    mesh_ap: k12-haus1-core
+    mesh_ap: k12-h1-core
     mesh_radio: 11a_standard
     mesh_iface: mesh
 
   # MESH - 2.4 GHz 802.11s
   - vid: 21
     role: mesh
-    name: mesh_2g
+    name: mesh_core_2g
     prefix: 10.31.226.146/32
     ipv6_subprefix: -21
     # make mesh_metric(s) for 2GHz worse than 5GHz
     mesh_metric: 1024
     mesh_metric_lqm: ['default 0.8']
-    mesh_ap: k12-haus1-core
+    mesh_ap: k12-h1-core
     mesh_radio: 11g_standard
     mesh_iface: mesh
 
+ # MESH - LAN
+  - vid: 30
+    role: mesh
+    name: mesh_lan
+    prefix: 10.31.226.147/32
+    ipv6_subprefix: -30
+    # adjust mesh_metric(s) to prefer this
+    mesh_metric: 128
+
+  # DHCP with filtering and isolation
+  - vid: 40
+    role: dhcp
+    inbound_filtering: true
+    enforce_client_isolation: true
+    prefix: 10.31.226.160/27
+    ipv6_subprefix: 0
+    assignments:
+      k12-h1-core: 1
+
   # MGMT
   - vid: 42
     role: mgmt
@@ -79,12 +76,24 @@ networks:
     dns: 1
     ipv6_subprefix: 1
     assignments:
-      k12-haus1-core: 1
+      k12-h1-core: 1
 
 # AP-id, wifi-channel, bandwidth, txpower
 location__channel_assignments_11a_standard__to_merge:
-  k12-haus1-core: 36-40
+  k12-h1-core: 36-40
 
 # AP-id, wifi-channel, bandwidth, txpower
 location__channel_assignments_11g_standard__to_merge:
-  k12-haus1-core: 13-20
+  k12-h1-core: 13-20
+
+dns_servers:
+  # quad9
+  - 9.9.9.9
+  - 149.112.112.112
+  - 2620:fe::fe
+  - 2620:fe::9
+  # cloudflare
+  - 1.1.1.1
+  - 1.0.0.1
+  - 2606:4700:4700::1111
+  - 2606:4700:4700::1001