From 9f42eaf942c164ff390a415d3b1529063c51d653 Mon Sep 17 00:00:00 2001 From: Sebastian Schmachtel Date: Sat, 3 Nov 2018 21:58:58 +0100 Subject: [PATCH] Inventory: added Wasserfloh Gateway --- inventory/ffmwu-gateways | 1 + inventory/group_vars/all | 4 --- .../host_vars/wasserfloh.freifunk-mwu.de | 33 +++++++++++++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 inventory/host_vars/wasserfloh.freifunk-mwu.de diff --git a/inventory/ffmwu-gateways b/inventory/ffmwu-gateways index 80348bb..87694d6 100644 --- a/inventory/ffmwu-gateways +++ b/inventory/ffmwu-gateways @@ -3,3 +3,4 @@ ingwer.freifunk-mwu.de lotuswurzel.freifunk-mwu.de uffschnitt.freifunk-mwu.de spinat.freifunk-mwu.de +wasserfloh.freifunk-mwu.de diff --git a/inventory/group_vars/all b/inventory/group_vars/all index be8aca1..8d25bfc 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -169,9 +169,6 @@ icvpn: icvpn_repo: https://github.com/freifunk/icvpn bgp_mwu_servers: - wasserfloh: - ipv4: 10.37.0.231 - ipv6: fd37:b4dc:4b1e::a25:e7 zuckerwatte: ipv4: 10.37.1.2 ipv6: fd37:b4dc:4b1e::a25:102 @@ -186,4 +183,3 @@ bgp_mwu_servers: ipv6: fd37:b4dc:4b1e::a25:2a legacy_gateways: - - wasserfloh diff --git a/inventory/host_vars/wasserfloh.freifunk-mwu.de b/inventory/host_vars/wasserfloh.freifunk-mwu.de new file mode 100644 index 0000000..54ff192 --- /dev/null +++ b/inventory/host_vars/wasserfloh.freifunk-mwu.de @@ -0,0 +1,33 @@ +--- +ffmwu_server_type: "gateway" + +magic: 231 +ipv4_dhcp_range: 9 + +ffrl_public_ipv4_nat: 185.66.195.33/32 + +ffrl_exit_server: + ffrl-a-ak-ber: + public_ipv4_address: 185.64.195.0 + tunnel_ipv4_network: 100.64.2.219/31 + tunnel_ipv6_network: 2a03:2260:0:117::/64 + ffrl-b-ak-ber: + public_ipv4_address: 185.66.195.1 + tunnel_ipv4_network: 100.64.2.221/31 + tunnel_ipv6_network: 2a03:2260:0:178::/64 + ffrl-a-ix-dus: + public_ipv4_address: 185.66.193.0 + tunnel_ipv4_network: 100.64.2.223/31 + tunnel_ipv6_network: 2a03:2260:0:179::/64 + ffrl-b-ix-dus: + public_ipv4_address: 185.66.193.1 + tunnel_ipv4_network: 100.64.2.225/31 + tunnel_ipv6_network: 2a03:2260:0:17a::/64 + ffrl-a-fra2-fra: + public_ipv4_address: 185.66.194.0 + tunnel_ipv4_network: 100.64.0.191/31 + tunnel_ipv6_network: 2a03:2260:0:65::/64 + ffrl-b-fra2-fra: + public_ipv4_address: 185.66.194.1 + tunnel_ipv4_network: 100.64.0.193/31 + tunnel_ipv6_network: 2a03:2260:0:66::/64