ak36, strom: unify gateway configs

freifunk-berlin · Jan 11, 2024 · e424ba2 · e424ba2
1 parent 508352a
commit e424ba2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/locations/ak36.yml b/locations/ak36.yml
@@ -59,7 +59,7 @@ ipv6_prefix: 2001:bf7:750:4000::/56
 uplink:
   ifname: eth0
   ipv4: 77.87.51.11/25
-#  ipv6: ToDo
+  # ipv6: ToDo
 
 mgmt:
   ifname: eth1
@@ -141,16 +141,16 @@ mesh_links:
 
 # Downlink IPv4 is in net announced by emma.
 
-sgw: "1000000 1000000"
 # OLSR Announce SmartGateway
+sgw: "1000000 1000000"
 
-tunnel_metric: 1024
 # Tunnel metric 1024 as most internet uplinks will hardly reach 40MBit/s
+tunnel_metric: 1024
 
 wireguard_base_prefix_ipv6: 2001:bf7:750:4002::/64
 wireguard_base_prefix_ipv4: 10.31.145.0/24
-gre_base_prefix: 2001:bf7:750:4003::/64
 
+gre_base_prefix: 2001:bf7:750:4003::/64
 
 # gre tunnel alias will be used as remote ifname. Must not exceed 9 chars
 gre_tunnel_alias: ak36

diff --git a/locations/strom.yml b/locations/strom.yml
@@ -60,7 +60,7 @@ mgmt:
     strom-perleberger: 3  # .67
     strom-tub: 4          # .68
     strom-no-5ghz: 5      # .69
-#   strom-so-5ghz: 6        .70 (inactive)
+    # strom-so-5ghz: 6    # .70 (inactive)
 
 # Mesh Network: 10.31.130.96/27
 mesh_links:
@@ -92,13 +92,14 @@ mesh_links:
 # OLSR Announce SmartGateway
 sgw: "1000000 1000000"
 
+# Tunnel metric 1024 as most internet uplinks will hardly reach 40MBit/s
 tunnel_metric: 1024
 
-gre_base_prefix: 2001:bf7:750:2a03::/64
-
 wireguard_base_prefix_ipv6: 2001:bf7:750:2a04::/64
 wireguard_base_prefix_ipv4: 10.31.164.0/24
 
+gre_base_prefix: 2001:bf7:750:2a03::/64
+
 # gre tunnel alias will be used as remote ifname. Must not exceed 9 chars
 gre_tunnel_alias: strom