From 8470cd30ad19fb2ed765309e999aafccf9c15e6d Mon Sep 17 00:00:00 2001 From: Grische Date: Tue, 31 Oct 2023 18:29:42 +0100 Subject: [PATCH 1/2] domains: add ffdon/donau-ries domains (cherry picked from commit eb2bc1c82829767317ef8c8ed87ffa942d9636b8) --- domains/ffdon_mitte.conf | 82 ++++++++++++++++++++++++++++++++++++ domains/ffdon_nordwest.conf | 81 ++++++++++++++++++++++++++++++++++++ domains/ffdon_sued.conf | 83 +++++++++++++++++++++++++++++++++++++ 3 files changed, 246 insertions(+) create mode 100644 domains/ffdon_mitte.conf create mode 100644 domains/ffdon_nordwest.conf create mode 100644 domains/ffdon_sued.conf diff --git a/domains/ffdon_mitte.conf b/domains/ffdon_mitte.conf new file mode 100644 index 00000000..be3cfb8a --- /dev/null +++ b/domains/ffdon_mitte.conf @@ -0,0 +1,82 @@ +{ + domain_names = { + ffdon_mitte = 'Freifunk Donau-Ries - Mitte', + ffdon_wemding = 'Freifunk Donau-Ries Wemding', + ffdon_monheim = 'Freifunk Donau-Ries Monheim', + ffdon_harburg = 'Freifunk Donau-Ries Harburg', + }, + hide_domain = true, -- temporary. for testing change with: gluon-switch-domain 'ffdon_mitte' + -- hide_domain = { 'ffdon_wemding', 'ffdon_monheim', 'ffdon_harburg' } -- legacy domains, only used for migration + domain_seed = 'b9d58035a5a2256627a813ee9d10ebdbf53bbac562fddf240c28ed2becf4c0ec', + + prefix4 = '10.86.128.0/21', + prefix6 = 'fd62:f45c:4d09:190::/64', + + extra_prefixes6 = { + '2001:678:e68:190::/64', + '2001:678:ed0:190::/64', + }, + + wifi24 = { + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + mesh = { + id = 'ffdon-mitte-mesh', + }, + }, + + wifi5 = { + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + mesh = { + id = 'ffdon-mitte-mesh', + }, + }, + + dns = { + servers = { + '2001:678:e68:ff00::3', + '2001:678:e68:ff00::4', + }, + }, + + next_node = { + name = { 'next.node' }, + ip4 = '10.86.128.1', + ip6 = 'fd62:f45c:4d09:190::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:40190', + link_address='fe80::27c:16ff:fec0:6c74', + }, + { + publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=', + endpoint ='gw05.ext.ffmuc.net:40190', + link_address='fe80::281:8eff:fef0:73aa', + }, + { + publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=', + endpoint ='gw06.ext.ffmuc.net:40190', + link_address='fe80::2a2:e4ff:fef9:2269', + }, + { + publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=', + endpoint ='gw07.ext.ffmuc.net:40190', + link_address='fe80::23b:d2ff:fe95:967f', + }, + }, + }, + }, +} diff --git a/domains/ffdon_nordwest.conf b/domains/ffdon_nordwest.conf new file mode 100644 index 00000000..8a3a76a8 --- /dev/null +++ b/domains/ffdon_nordwest.conf @@ -0,0 +1,81 @@ +{ + domain_names = { + ffdon_nordwest = 'Freifunk Donau-Ries - Nordwest', + ffdon_noerdlingen = 'Freifunk Donau-Ries Noerdlingen', + ffdon_oettingen = 'Freifunk Donau-Ries Oettingen', + }, + hide_domain = true, -- temporary. for testing change with: gluon-switch-domain 'ffdon_nordwest' + -- hide_domain = { 'ffdon_noerdlingen', 'ffdon_oettingen' } -- legacy domains, only used for migration + domain_seed = '0cd943171cdc3afa3546a01dbbb48a6386fc871251f4e55f785e23bdbe3b31c4', + + prefix4 = '10.86.136.0/21', + prefix6 = 'fd62:f45c:4d09:191::/64', + + extra_prefixes6 = { + '2001:678:e68:191::/64', + '2001:678:ed0:191::/64', + }, + + wifi24 = { + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + mesh = { + id = 'ffdon-nordwest-mesh', + }, + }, + + wifi5 = { + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + mesh = { + id = 'ffdon-nordwest-mesh', + }, + }, + + dns = { + servers = { + '2001:678:e68:ff00::3', + '2001:678:e68:ff00::4', + }, + }, + + next_node = { + name = { 'next.node' }, + ip4 = '10.86.136.1', + ip6 = 'fd62:f45c:4d09:191::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:40191', + link_address='fe80::27c:16ff:fec0:6c74', + }, + { + publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=', + endpoint ='gw05.ext.ffmuc.net:40191', + link_address='fe80::281:8eff:fef0:73aa', + }, + { + publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=', + endpoint ='gw06.ext.ffmuc.net:40191', + link_address='fe80::2a2:e4ff:fef9:2269', + }, + { + publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=', + endpoint ='gw07.ext.ffmuc.net:40191', + link_address='fe80::23b:d2ff:fe95:967f', + }, + }, + }, + }, +} diff --git a/domains/ffdon_sued.conf b/domains/ffdon_sued.conf new file mode 100644 index 00000000..234cb76f --- /dev/null +++ b/domains/ffdon_sued.conf @@ -0,0 +1,83 @@ +{ + domain_names = { + ffdon_sued = 'Freifunk Donau-Ries - Süd', + ffdon_donauwoerth = 'Freifunk Donau-Ries Donauwoerth', + ffdon_baeumenheim = 'Freifunk Donau-Ries Baeumenheim', + ffdon_rain = 'Freifunk Donau-Ries Rain', + ffdon_umland = 'Freifunk Donau-Ries Umland', + }, + hide_domain = true, -- temporary. for testing change with: gluon-switch-domain 'ffdon_sued' + -- hide_domain = { 'ffdon_donauwoerth', 'ffdon_baeumenheim', 'ffdon_rain', 'ffdon_umland' } -- legacy domains, only used for migration + domain_seed = '022be6c32c6ccd16744fbee39354451551c2a21b10b3331082e527d7a7705a7f', + + prefix4 = '10.86.144.0/21', + prefix6 = 'fd62:f45c:4d09:192::/64', + + extra_prefixes6 = { + '2001:678:e68:192::/64', + '2001:678:ed0:192::/64', + }, + + wifi24 = { + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + mesh = { + id = 'ffdon-sued-mesh', + }, + }, + + wifi5 = { + ap = { + ssid = 'Freifunk-Donau-Ries', + }, + mesh = { + id = 'ffdon-sued-mesh', + }, + }, + + dns = { + servers = { + '2001:678:e68:ff00::3', + '2001:678:e68:ff00::4', + }, + }, + + next_node = { + name = { 'next.node' }, + ip4 = '10.86.144.1', + ip6 = 'fd62:f45c:4d09:192::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:40192', + link_address='fe80::27c:16ff:fec0:6c74', + }, + { + publickey ='igyqOmWiz4EZxPG8ZzU537MnHhaqlwfa7HarB3KmnEg=', + endpoint ='gw05.ext.ffmuc.net:40192', + link_address='fe80::281:8eff:fef0:73aa', + }, + { + publickey ='pkRaUOoLuuHnUt9BEGeKrhF3OMYBPecc0iYkika6uhE=', + endpoint ='gw06.ext.ffmuc.net:40192', + link_address='fe80::2a2:e4ff:fef9:2269', + }, + { + publickey ='PcKkakZcTEx3LKh+G06Opb8/esg08aWK33A5/Ff1YXE=', + endpoint ='gw07.ext.ffmuc.net:40192', + link_address='fe80::23b:d2ff:fe95:967f', + }, + }, + }, + }, +} From b9a0290df88f3cd493abee3dd891a52ce6f5353a Mon Sep 17 00:00:00 2001 From: Grische Date: Wed, 8 Nov 2023 17:41:42 +0100 Subject: [PATCH 2/2] domains: fix ffdon domains for Gluon pre-2022 See https://github.com/freifunk-gluon/gluon/commit/7c81897b4ccc2213972c0409a59b07f1fda87a0f --- domains/ffdon_mitte.conf | 2 +- domains/ffdon_nordwest.conf | 2 +- domains/ffdon_sued.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/domains/ffdon_mitte.conf b/domains/ffdon_mitte.conf index be3cfb8a..520d2cfe 100644 --- a/domains/ffdon_mitte.conf +++ b/domains/ffdon_mitte.conf @@ -49,10 +49,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/ffdon_nordwest.conf b/domains/ffdon_nordwest.conf index 8a3a76a8..e3cd216c 100644 --- a/domains/ffdon_nordwest.conf +++ b/domains/ffdon_nordwest.conf @@ -48,10 +48,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/ffdon_sued.conf b/domains/ffdon_sued.conf index 234cb76f..c3ebcca5 100644 --- a/domains/ffdon_sued.conf +++ b/domains/ffdon_sued.conf @@ -50,10 +50,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 = {