From 86aa5d6d68bcf5cbe7bccf0b650bd8b567ff0375 Mon Sep 17 00:00:00 2001 From: Tobias Schwarz Date: Thu, 11 Jan 2024 16:52:42 +0000 Subject: [PATCH 1/4] l105: single file format and cleanup --- group_vars/location_l105/general.yml | 2 -- host_vars/l105-gw/base.yml | 10 --------- host_vars/l105-gw/owm.yml | 4 ---- .../l105-gw/gateway.yml => locations/l105.yml | 21 ++++++++++++++++--- 4 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 group_vars/location_l105/general.yml delete mode 100644 host_vars/l105-gw/base.yml delete mode 100644 host_vars/l105-gw/owm.yml rename host_vars/l105-gw/gateway.yml => locations/l105.yml (83%) diff --git a/group_vars/location_l105/general.yml b/group_vars/location_l105/general.yml deleted file mode 100644 index 0a4610acb..000000000 --- a/group_vars/location_l105/general.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -community: true diff --git a/host_vars/l105-gw/base.yml b/host_vars/l105-gw/base.yml deleted file mode 100644 index 095d1f121..000000000 --- a/host_vars/l105-gw/base.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -location: l105 -role: gateway -model: "x86-64" - -image_search_pattern: "*-ext4-combined.img*" - -l105__disabled_services__to_merge: - - "bird" diff --git a/host_vars/l105-gw/owm.yml b/host_vars/l105-gw/owm.yml deleted file mode 100644 index 1ae14f60f..000000000 --- a/host_vars/l105-gw/owm.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -location_nice: Lützowstraße 105 -latitude: 52.502040 -longitude: 13.369420 diff --git a/host_vars/l105-gw/gateway.yml b/locations/l105.yml similarity index 83% rename from host_vars/l105-gw/gateway.yml rename to locations/l105.yml index 51c34a476..e87d3915e 100644 --- a/host_vars/l105-gw/gateway.yml +++ b/locations/l105.yml @@ -1,5 +1,20 @@ --- +location: l105 +location_nice: Lützowstraße 105 +latitude: 52.502040 +longitude: 13.369420 +community: true + +hosts: + + - hostname: l105-gw + role: gateway + model: "x86-64" + image_search_pattern: "*-ext4-combined.img*" + l105__disabled_services__to_merge: + - "bird" + # L105 got following prefixes: # Router: 10.31.127.128/25 2001:bf7:750:3f00::/56 # --MGMT: 10.31.127.128/27 @@ -14,7 +29,7 @@ ipv6_prefix: 2001:bf7:750:3f00::/56 uplink: ifname: eth0 ipv4: 77.87.49.8/28 -# ipv6: ToDo + # ipv6: ToDo mgmt: ifname: eth1.42 @@ -51,12 +66,12 @@ 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 # 2001:bf7:760:2200::/56 is the base prefix +tunnel_metric: 1024 wireguard_base_prefix_ipv6: 2001:bf7:750:3f02::/64 wireguard_base_prefix_ipv4: 10.31.143.0/24 From cbba6ccd6081360490548a318916b0e8bf9ec57e Mon Sep 17 00:00:00 2001 From: Tobias Schwarz Date: Thu, 11 Jan 2024 16:53:21 +0000 Subject: [PATCH 2/4] ohlauer: single file format and cleanup --- host_vars/ohlauer-gw/base.yml | 5 ----- host_vars/ohlauer-gw/general.yml | 2 -- host_vars/ohlauer-gw/owm.yml | 4 ---- .../gateway.yml => locations/ohlauer.yml | 17 +++++++++++++++-- 4 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 host_vars/ohlauer-gw/base.yml delete mode 100644 host_vars/ohlauer-gw/general.yml delete mode 100644 host_vars/ohlauer-gw/owm.yml rename host_vars/ohlauer-gw/gateway.yml => locations/ohlauer.yml (82%) diff --git a/host_vars/ohlauer-gw/base.yml b/host_vars/ohlauer-gw/base.yml deleted file mode 100644 index 846094d5b..000000000 --- a/host_vars/ohlauer-gw/base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -location: ohlauer -role: gateway -model: "ubnt_edgerouter-4" diff --git a/host_vars/ohlauer-gw/general.yml b/host_vars/ohlauer-gw/general.yml deleted file mode 100644 index 0a4610acb..000000000 --- a/host_vars/ohlauer-gw/general.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -community: true diff --git a/host_vars/ohlauer-gw/owm.yml b/host_vars/ohlauer-gw/owm.yml deleted file mode 100644 index 560c79bf5..000000000 --- a/host_vars/ohlauer-gw/owm.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -location_nice: Ohlauer -latitude: 52.49378703855491 -longitude: 13.42969238683751 diff --git a/host_vars/ohlauer-gw/gateway.yml b/locations/ohlauer.yml similarity index 82% rename from host_vars/ohlauer-gw/gateway.yml rename to locations/ohlauer.yml index 99cdf9957..710350a47 100644 --- a/host_vars/ohlauer-gw/gateway.yml +++ b/locations/ohlauer.yml @@ -1,4 +1,17 @@ --- + +location: ohlauer +location_nice: Ohlauer +latitude: 52.49378703855491 +longitude: 13.42969238683751 +community: true + +hosts: + + - hostname: ohlauer-gw + role: gateway + model: "ubnt_edgerouter-4" + ipv6_prefix: 2001:bf7:830:8300::/56 # mgmt: 10.31.166.248/29 @@ -28,12 +41,12 @@ mesh_links: # Downlink IPv4 is in net announced by emma. -sgw: "100000 100000" # OLSR Announce SmartGateway +sgw: "100000 100000" -tunnel_metric: 1024 # Tunnel metric 1024 as most internet uplinks will hardly reach 40MBit/s # 2001:bf7:830:8300::/56 is the base prefix +tunnel_metric: 1024 wireguard_base_prefix_ipv6: 2001:bf7:830:8302::/64 wireguard_base_prefix_ipv4: 10.31.140.0/24 From b15e0f938564dba3d9ee957e6e4bf6fca7bdd3ca Mon Sep 17 00:00:00 2001 From: Tobias Schwarz Date: Thu, 11 Jan 2024 16:53:55 +0000 Subject: [PATCH 3/4] saarbruecker: single file format and cleanup --- host_vars/saarbruecker-gw/base.yml | 5 ----- host_vars/saarbruecker-gw/general.yml | 2 -- host_vars/saarbruecker-gw/owm.yml | 4 ---- .../gateway.yml => locations/saarbruecker.yml | 18 +++++++++++++++--- 4 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 host_vars/saarbruecker-gw/base.yml delete mode 100644 host_vars/saarbruecker-gw/general.yml delete mode 100644 host_vars/saarbruecker-gw/owm.yml rename host_vars/saarbruecker-gw/gateway.yml => locations/saarbruecker.yml (85%) diff --git a/host_vars/saarbruecker-gw/base.yml b/host_vars/saarbruecker-gw/base.yml deleted file mode 100644 index cc744ce61..000000000 --- a/host_vars/saarbruecker-gw/base.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- - -location: saarbruecker -role: gateway -model: "ubnt_edgerouter-4" diff --git a/host_vars/saarbruecker-gw/general.yml b/host_vars/saarbruecker-gw/general.yml deleted file mode 100644 index 0a4610acb..000000000 --- a/host_vars/saarbruecker-gw/general.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -community: true diff --git a/host_vars/saarbruecker-gw/owm.yml b/host_vars/saarbruecker-gw/owm.yml deleted file mode 100644 index 743394b73..000000000 --- a/host_vars/saarbruecker-gw/owm.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -location_nice: Saarbrücker -latitude: 52.5283930134242 -longitude: 13.41561550087894 diff --git a/host_vars/saarbruecker-gw/gateway.yml b/locations/saarbruecker.yml similarity index 85% rename from host_vars/saarbruecker-gw/gateway.yml rename to locations/saarbruecker.yml index fbb5a54e3..a7f1f04bc 100644 --- a/host_vars/saarbruecker-gw/gateway.yml +++ b/locations/saarbruecker.yml @@ -1,4 +1,17 @@ --- + +location: saarbruecker +location_nice: Saarbrücker +latitude: 52.5283930134242 +longitude: 13.41561550087894 +community: true + +hosts: + + - hostname: saarbruecker-gw + role: gateway + model: "ubnt_edgerouter-4" + ipv6_prefix: 2001:bf7:760:2201::/56 uplink: @@ -42,18 +55,17 @@ 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 # 2001:bf7:760:2200::/56 is the base prefix +tunnel_metric: 1024 wireguard_base_prefix_ipv6: 2001:bf7:760:2202::/64 wireguard_base_prefix_ipv4: 10.31.141.0/24 gre_base_prefix: 2001:bf7:760:2201::/64 - # gre tunnel alias will be used as remote ifname. Must not exceed 9 chars gre_tunnel_alias: saarbrue From f9fc19b6b0b99d83a1e706b714e7b6411fe7e11d Mon Sep 17 00:00:00 2001 From: Tobias Schwarz Date: Thu, 11 Jan 2024 16:55:03 +0000 Subject: [PATCH 4/4] ak36, strom: unify gateway configs --- locations/ak36.yml | 8 ++++---- locations/strom.yml | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/locations/ak36.yml b/locations/ak36.yml index 3336213f2..30cc35fd6 100644 --- 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 index 0fee9ec92..ef79c7ebe 100644 --- 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