From d1c85181c354a466a0e3eb7b330eb7a1d3faa7f9 Mon Sep 17 00:00:00 2001 From: Grische Date: Tue, 31 Oct 2023 17:41:11 +0100 Subject: [PATCH 1/5] domains: add wertingen domains --- domains/ffwert_city.conf | 79 ++++++++++++++++++++++++++++++++++++++ domains/ffwert_events.conf | 79 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 domains/ffwert_city.conf create mode 100644 domains/ffwert_events.conf diff --git a/domains/ffwert_city.conf b/domains/ffwert_city.conf new file mode 100644 index 00000000..f6b7237e --- /dev/null +++ b/domains/ffwert_city.conf @@ -0,0 +1,79 @@ +{ + domain_names = { + ffwert_city = 'Freifunk Wertingen - City', + }, + hide_domain = true, -- temporary. for testing change with: gluon-switch-domain 'ffwert_city' + + domain_seed = 'ef14c53a30580124e31a1824294b11c16a5e0a0fd083d226e8527f471a3583c3', + + prefix4 = '10.80.232.0/21', + prefix6 = 'fd62:f45c:4d09:10d::/64', + + extra_prefixes6 = { + '2001:678:e68:10d::/64', + '2001:678:ed0:10d::/64', + }, + + wifi24 = { + ap = { + ssid = 'wertingen.freifunk.net', + }, + mesh = { + id = 'ffwert-city-mesh', + }, + }, + + wifi5 = { + ap = { + ssid = 'wertingen.freifunk.net', + }, + mesh = { + id = 'ffwert-city-mesh', + }, + }, + + dns = { + servers = { + '2001:678:e68:ff00::3', + '2001:678:e68:ff00::4', + }, + }, + + next_node = { + name = { 'next.node' }, + ip4 = '10.80.232.1', + ip6 = 'fd62:f45c:4d09:10d::1', + }, + + mesh_vpn = { + wireguard = { + enabled = 'true', + iface = 'wg_mesh_vpn', + mtu = 1406, + limit = '1', -- actually unused + broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + peers = { + { + publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', + endpoint ='gw04.ext.ffmuc.net:40017', + link_address='fe80::27c:16ff:fec0:6c74', + }, + { + publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=', + endpoint ='gw05.ext.ffmuc.net:40017', + link_address='fe80::281:8eff:fef0:73aa', + }, + { + publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=', + endpoint ='gw06.ext.ffmuc.net:40017', + link_address='fe80::2a2:e4ff:fef9:2269', + }, + { + publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=', + endpoint ='gw07.ext.ffmuc.net:40017', + link_address='fe80::23b:d2ff:fe95:967f', + }, + }, + }, + }, +} diff --git a/domains/ffwert_events.conf b/domains/ffwert_events.conf new file mode 100644 index 00000000..9ce7537d --- /dev/null +++ b/domains/ffwert_events.conf @@ -0,0 +1,79 @@ +{ + domain_names = { + ffwert_events = 'Freifunk Wertingen - Events' + }, + hide_domain = true, -- temporary. for testing change with: gluon-switch-domain 'ffwert_events' + + domain_seed = '617c853fbb7242936dbe410f9a828dca5b6f96e85f42e42808a39b21e002db93', + + prefix4 = '10.80.240.0/21', + prefix6 = 'fd62:f45c:4d09:10e::/64', + + extra_prefixes6 = { + '2001:678:e68:10e::/64', + '2001:678:ed0:10e::/64', + }, + + wifi24 = { + ap = { + ssid = 'wertingen.freifunk.net', + }, + mesh = { + id = 'ffwert-events-mesh', + }, + }, + + wifi5 = { + ap = { + ssid = 'wertingen.freifunk.net', + }, + mesh = { + id = 'ffwert-events-mesh', + }, + }, + + dns = { + servers = { + '2001:678:e68:ff00::3', + '2001:678:e68:ff00::4', + }, + }, + + next_node = { + name = { 'next.node' }, + ip4 = '10.80.240.1', + ip6 = 'fd62:f45c:4d09:10e::1', + }, + + mesh_vpn = { + wireguard = { + enabled = 'true', + iface = 'wg_mesh_vpn', + mtu = 1406, + limit = '1', -- actually unused + broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + peers = { + { + publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', + endpoint ='gw04.ext.ffmuc.net:40018', + link_address='fe80::27c:16ff:fec0:6c74', + }, + { + publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=', + endpoint ='gw05.ext.ffmuc.net:40018', + link_address='fe80::281:8eff:fef0:73aa', + }, + { + publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=', + endpoint ='gw06.ext.ffmuc.net:40018', + link_address='fe80::2a2:e4ff:fef9:2269', + }, + { + publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=', + endpoint ='gw07.ext.ffmuc.net:40018', + link_address='fe80::23b:d2ff:fe95:967f', + }, + }, + }, + }, +} From 78759b1151b23796bc2be20a032026d883213871 Mon Sep 17 00:00:00 2001 From: Grische Date: Mon, 6 Nov 2023 23:24:56 +0100 Subject: [PATCH 2/5] domains: update ffwert domains with new IP ranges --- domains/ffwert_city.conf | 12 ++++++------ domains/ffwert_events.conf | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/domains/ffwert_city.conf b/domains/ffwert_city.conf index f6b7237e..f3d7f128 100644 --- a/domains/ffwert_city.conf +++ b/domains/ffwert_city.conf @@ -6,12 +6,12 @@ domain_seed = 'ef14c53a30580124e31a1824294b11c16a5e0a0fd083d226e8527f471a3583c3', - prefix4 = '10.80.232.0/21', - prefix6 = 'fd62:f45c:4d09:10d::/64', + prefix4 = '10.86.0.0/21', + prefix6 = 'fd62:f45c:4d09:180::/64', extra_prefixes6 = { - '2001:678:e68:10d::/64', - '2001:678:ed0:10d::/64', + '2001:678:e68:180::/64', + '2001:678:ed0:180::/64', }, wifi24 = { @@ -41,8 +41,8 @@ next_node = { name = { 'next.node' }, - ip4 = '10.80.232.1', - ip6 = 'fd62:f45c:4d09:10d::1', + ip4 = '10.86.0.1', + ip6 = 'fd62:f45c:4d09:180::1', }, mesh_vpn = { diff --git a/domains/ffwert_events.conf b/domains/ffwert_events.conf index 9ce7537d..0631cb07 100644 --- a/domains/ffwert_events.conf +++ b/domains/ffwert_events.conf @@ -6,12 +6,12 @@ domain_seed = '617c853fbb7242936dbe410f9a828dca5b6f96e85f42e42808a39b21e002db93', - prefix4 = '10.80.240.0/21', - prefix6 = 'fd62:f45c:4d09:10e::/64', + prefix4 = '10.86.8.0/21', + prefix6 = 'fd62:f45c:4d09:181::/64', extra_prefixes6 = { - '2001:678:e68:10e::/64', - '2001:678:ed0:10e::/64', + '2001:678:e68:181::/64', + '2001:678:ed0:181::/64', }, wifi24 = { @@ -41,8 +41,8 @@ next_node = { name = { 'next.node' }, - ip4 = '10.80.240.1', - ip6 = 'fd62:f45c:4d09:10e::1', + ip4 = '10.86.8.1', + ip6 = 'fd62:f45c:4d09:181::1', }, mesh_vpn = { From 88b913eec51da0cb99b9fcd77fa13966778d3800 Mon Sep 17 00:00:00 2001 From: Grische Date: Mon, 6 Nov 2023 23:31:46 +0100 Subject: [PATCH 3/5] domains: new endpoint ports for ffwert domains --- domains/ffwert_city.conf | 8 ++++---- domains/ffwert_events.conf | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/domains/ffwert_city.conf b/domains/ffwert_city.conf index f3d7f128..6ab791a7 100644 --- a/domains/ffwert_city.conf +++ b/domains/ffwert_city.conf @@ -55,22 +55,22 @@ peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', - endpoint ='gw04.ext.ffmuc.net:40017', + endpoint ='gw04.ext.ffmuc.net:40180', link_address='fe80::27c:16ff:fec0:6c74', }, { publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=', - endpoint ='gw05.ext.ffmuc.net:40017', + endpoint ='gw05.ext.ffmuc.net:40180', link_address='fe80::281:8eff:fef0:73aa', }, { publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=', - endpoint ='gw06.ext.ffmuc.net:40017', + endpoint ='gw06.ext.ffmuc.net:40180', link_address='fe80::2a2:e4ff:fef9:2269', }, { publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=', - endpoint ='gw07.ext.ffmuc.net:40017', + endpoint ='gw07.ext.ffmuc.net:40180', link_address='fe80::23b:d2ff:fe95:967f', }, }, diff --git a/domains/ffwert_events.conf b/domains/ffwert_events.conf index 0631cb07..e615f01f 100644 --- a/domains/ffwert_events.conf +++ b/domains/ffwert_events.conf @@ -55,22 +55,22 @@ peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', - endpoint ='gw04.ext.ffmuc.net:40018', + endpoint ='gw04.ext.ffmuc.net:40181', link_address='fe80::27c:16ff:fec0:6c74', }, { publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=', - endpoint ='gw05.ext.ffmuc.net:40018', + endpoint ='gw05.ext.ffmuc.net:40181', link_address='fe80::281:8eff:fef0:73aa', }, { publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=', - endpoint ='gw06.ext.ffmuc.net:40018', + endpoint ='gw06.ext.ffmuc.net:40181', link_address='fe80::2a2:e4ff:fef9:2269', }, { publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=', - endpoint ='gw07.ext.ffmuc.net:40018', + endpoint ='gw07.ext.ffmuc.net:40181', link_address='fe80::23b:d2ff:fe95:967f', }, }, From d00b3527624ef67bfd688d16df4366b2a5c7107c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?istrator=C2=B2?= <82608337+istrator2@users.noreply.github.com> Date: Tue, 5 Dec 2023 12:23:40 +0100 Subject: [PATCH 4/5] Update ffwert_city.conf make ffwert_city public --- domains/ffwert_city.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/domains/ffwert_city.conf b/domains/ffwert_city.conf index 6ab791a7..a77c140f 100644 --- a/domains/ffwert_city.conf +++ b/domains/ffwert_city.conf @@ -2,7 +2,6 @@ domain_names = { ffwert_city = 'Freifunk Wertingen - City', }, - hide_domain = true, -- temporary. for testing change with: gluon-switch-domain 'ffwert_city' domain_seed = 'ef14c53a30580124e31a1824294b11c16a5e0a0fd083d226e8527f471a3583c3', From cd73f66d17f8f22e29943c3058ccbc869ea82803 Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Sat, 6 Apr 2024 17:32:04 +0200 Subject: [PATCH 5/5] domains: add ffwert mtu for v2021.1.x --- domains/ffwert_city.conf | 2 +- domains/ffwert_events.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/domains/ffwert_city.conf b/domains/ffwert_city.conf index a77c140f..bc996b5d 100644 --- a/domains/ffwert_city.conf +++ b/domains/ffwert_city.conf @@ -45,10 +45,10 @@ }, mesh_vpn = { + mtu = 1406, wireguard = { enabled = 'true', iface = 'wg_mesh_vpn', - mtu = 1406, limit = '1', -- actually unused broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', peers = { diff --git a/domains/ffwert_events.conf b/domains/ffwert_events.conf index e615f01f..b782631d 100644 --- a/domains/ffwert_events.conf +++ b/domains/ffwert_events.conf @@ -46,10 +46,10 @@ }, mesh_vpn = { + mtu = 1406, wireguard = { enabled = 'true', iface = 'wg_mesh_vpn', - mtu = 1406, limit = '1', -- actually unused broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', peers = {