Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gateways: unify configs #713

Merged
merged 4 commits into from
Jan 12, 2024
Merged

gateways: unify configs #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86aa5d6
l105: single file format and cleanup
Noki Jan 11, 2024
cbba6cc
ohlauer: single file format and cleanup
Noki Jan 11, 2024
b15e0f9
saarbruecker: single file format and cleanup
Noki Jan 11, 2024
f9fc19b
ak36, strom: unify gateway configs
Noki Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions group_vars/location_l105/general.yml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions host_vars/l105-gw/base.yml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions host_vars/l105-gw/owm.yml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions host_vars/ohlauer-gw/base.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions host_vars/ohlauer-gw/general.yml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions host_vars/ohlauer-gw/owm.yml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions host_vars/saarbruecker-gw/base.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions host_vars/saarbruecker-gw/general.yml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions host_vars/saarbruecker-gw/owm.yml
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions locations/ak36.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
21 changes: 18 additions & 3 deletions host_vars/l105-gw/gateway.yml → locations/l105.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
17 changes: 15 additions & 2 deletions host_vars/ohlauer-gw/gateway.yml → locations/ohlauer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
18 changes: 15 additions & 3 deletions host_vars/saarbruecker-gw/gateway.yml → locations/saarbruecker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
7 changes: 4 additions & 3 deletions locations/strom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down