Merge branch 'main' into birdbabelgw-metrics

freifunk-berlin · Dec 1, 2024 · 114b2e8 · 114b2e8
2 parents 0b6c685 + ce95e91
commit 114b2e8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/locations/bht.yml b/locations/bht.yml
@@ -140,6 +140,7 @@ networks:
     prefix: 10.230.23.128/32
     ipv6_subprefix: -10
     ptp: true
+    # Prefer routing via perleberger36 over segen
     mesh_metric: 1024
     mesh_metric_lqm: ['default 0.2']
 
@@ -149,6 +150,9 @@ networks:
     prefix: 10.230.23.129/32
     ipv6_subprefix: -11
     ptp: true
+    # Prefer routing via perleberger36 over segen, chris, mela
+    mesh_metric: 256
+
 
   - vid: 12
     role: mesh
@@ -173,6 +177,9 @@ networks:
     name: mesh_jup
     prefix: 10.230.23.133/32
     ipv6_subprefix: -15
+    # Set metrics similar as for mesh_segen so path via jup is always worse
+    mesh_metric: 1024
+    mesh_metric_lqm: ['default 0.25']
 
   - vid: 16
     role: mesh

diff --git a/locations/jup.yml b/locations/jup.yml
@@ -65,8 +65,6 @@ networks:
     name: mesh_bht
     prefix: 10.31.147.128/32
     ipv6_subprefix: -1
-    mesh_metric: 1024
-    mesh_metric_lqm: ['default 0.5']
     ptp: true
 
   - vid: 11

diff --git a/locations/k12-h2.yml b/locations/k12-h2.yml
@@ -59,7 +59,7 @@ networks:
   - vid: 20
     role: mesh
     name: mesh_core_5g
-    prefix: 10.31.158.1129/32
+    prefix: 10.31.158.129/32
     ipv6_subprefix: -20
     mesh_ap: k12-h2-core
     mesh_radio: 11a_standard
@@ -115,7 +115,7 @@ networks:
   - vid: 30
     role: mesh
     name: mesh_lan
-    prefix: 10.31.226.134/32
+    prefix: 10.31.158.134/32
     ipv6_subprefix: -30
     # adjust mesh_metric to prefer this route
     mesh_metric: 128
@@ -155,12 +155,18 @@ networks:
     mtu: 1280
     prefix: 10.31.158.224/32
     wireguard_port: 51820
+    # Make sure tunnel is only last resort backup
+    mesh_metric: 2304
+    mesh_metric_lqm: ['default 0.6']
 
   - role: tunnel
     ifname: ts_wg1
     mtu: 1280
     prefix: 10.31.158.225/32
     wireguard_port: 51821
+    # Make sure tunnel is only last resort backup
+    mesh_metric: 2304
+    mesh_metric_lqm: ['default 0.6']
 
 # AP-id, wifi-channel, bandwidth, txpower
 location__channel_assignments_11a_standard__to_merge:
@@ -186,3 +192,13 @@ dns_servers:
   - 1.0.0.1
   - 2606:4700:4700::1111
   - 2606:4700:4700::1001
+
+# Switch Ports
+# 1: uplink
+# 2: AP
+# 3:
+# 4: CORE
+# 5: AP
+# 6: AP
+# 7: k12-h1-core, VLAN 30
+# 8: segen