From 3e1d2337368e6adda02cf3365b21b1b9c7ae257c Mon Sep 17 00:00:00 2001 From: Grische Date: Tue, 25 Jul 2023 23:42:44 +0200 Subject: [PATCH 1/5] site: remove some packages to save space --- site.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/site.mk b/site.mk index eb93402..86f6c9a 100644 --- a/site.mk +++ b/site.mk @@ -8,9 +8,7 @@ GLUON_DEPRECATED := upgrade # depending on the combination of features listed GLUON_FEATURES := \ - advancedstats \ autoupdater \ - config-mode-statistics \ config-mode-domain-select \ ebtables-filter-multicast \ ebtables-filter-ra-dhcp \ From be0476a98d360f11ee18738d7a6a5ca0d1631cfb Mon Sep 17 00:00:00 2001 From: Grische Date: Tue, 25 Jul 2023 22:24:20 +0200 Subject: [PATCH 2/5] site: add english Gluon support --- site.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site.mk b/site.mk index 86f6c9a..1eb1cc5 100644 --- a/site.mk +++ b/site.mk @@ -41,5 +41,7 @@ GLUON_SITE_PACKAGES := \ iwinfo GLUON_PRIORITY ?= 3 -GLUON_LANGS ?= de GLUON_REGION ?= eu + +# Languages to include +GLUON_LANGS ?= en de From be956ad26c31d3a1e55c9980b0d035711b4539c3 Mon Sep 17 00:00:00 2001 From: Grische Date: Tue, 25 Jul 2023 23:36:17 +0200 Subject: [PATCH 3/5] build only ar71xx-tiny devices are in use Works around issues with ar71xx-tiny devices that do not have enough flash with the new wireguard packages. --- scripts/build.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/scripts/build.sh b/scripts/build.sh index 72fc8ce..0467bf5 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -39,6 +39,52 @@ if [ -d "patches" ]; then fi pushd "${gluon_build_dir}" + +# exclude building some devices to work around some flash size constraints +if [ "${target}" = "ar71xx-tiny" ]; then + export GLUON_DEVICES="tp-link-tl-wr740n-nd-v1 +tp-link-tl-wr740n-nd-v3 +tp-link-tl-wr740n-nd-v4 +tp-link-tl-wr740n-nd-v5 +tp-link-tl-wr741n-nd-v1 +tp-link-tl-wr741n-nd-v2 +tp-link-tl-wr741n-nd-v4 +tp-link-tl-wr741n-nd-v5 +tp-link-tl-wr743n-nd-v1 +tp-link-tl-wr743n-nd-v2 +tp-link-tl-wa801n-nd-v1 +tp-link-tl-wa801n-nd-v2 +tp-link-tl-wa801n-nd-v3 +tp-link-tl-wr840n-v2 +tp-link-tl-wr841n-nd-v3 +tp-link-tl-wr841n-nd-v5 +tp-link-tl-wr841n-nd-v7 +tp-link-tl-wr841n-nd-v8 +tp-link-tl-wr841n-nd-v9 +tp-link-tl-wr841n-nd-v10 +tp-link-tl-wr841n-nd-v11 +tp-link-tl-wr841n-nd-v12 +tp-link-tl-wr843n-nd-v1 +tp-link-tl-wr941n-nd-v2 +tp-link-tl-wr941n-nd-v3 +tp-link-tl-wr941n-nd-v4 +tp-link-tl-wr941n-nd-v5 +tp-link-tl-wr941n-nd-v6 +tp-link-tl-wr940n-v4 +tp-link-tl-wr940n-v6 +tp-link-tl-wa730re-v1 +tp-link-tl-wa750re-v1 +tp-link-tl-wa830re-v1 +tp-link-tl-wa830re-v2 +tp-link-tl-wa850re-v1 +tp-link-tl-wa860re-v1 +tp-link-tl-wa901n-nd-v1 +tp-link-tl-wa901n-nd-v2 +tp-link-tl-wa901n-nd-v3 +tp-link-tl-wa901n-nd-v4 +tp-link-tl-wa901n-nd-v5" +fi + make update GLUON_RELEASE="${gluon_ref}+${version}" GLUON_TARGET="${target}" GLUON_BRANCH=stable -j1 V=99 # nproc only returns a number, it is safe to disable it here # shellcheck disable=SC2086 From fc2b3f5f040b8e9519c1a22fa6cd8c811301f701 Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Sun, 26 Nov 2023 13:25:43 +0100 Subject: [PATCH 4/5] domains: replace domains with new ffmuc domains --- domains/ffdon_baeumenheim.conf | 53 --------------------- domains/ffdon_donauwoerth.conf | 53 --------------------- domains/ffdon_harburg.conf | 53 --------------------- domains/ffdon_mitte.conf | 84 +++++++++++++++++++++++++++++++++ domains/ffdon_monheim.conf | 53 --------------------- domains/ffdon_noerdlingen.conf | 53 --------------------- domains/ffdon_nordwest.conf | 83 +++++++++++++++++++++++++++++++++ domains/ffdon_oettingen.conf | 53 --------------------- domains/ffdon_rain.conf | 53 --------------------- domains/ffdon_sued.conf | 85 ++++++++++++++++++++++++++++++++++ domains/ffdon_umland.conf | 53 --------------------- domains/ffdon_wemding.conf | 53 --------------------- domains/ffmuc_ffdon_test.conf | 53 --------------------- 13 files changed, 252 insertions(+), 530 deletions(-) delete mode 100644 domains/ffdon_baeumenheim.conf delete mode 100644 domains/ffdon_donauwoerth.conf delete mode 100644 domains/ffdon_harburg.conf create mode 100644 domains/ffdon_mitte.conf delete mode 100644 domains/ffdon_monheim.conf delete mode 100644 domains/ffdon_noerdlingen.conf create mode 100644 domains/ffdon_nordwest.conf delete mode 100644 domains/ffdon_oettingen.conf delete mode 100644 domains/ffdon_rain.conf create mode 100644 domains/ffdon_sued.conf delete mode 100644 domains/ffdon_umland.conf delete mode 100644 domains/ffdon_wemding.conf delete mode 100644 domains/ffmuc_ffdon_test.conf diff --git a/domains/ffdon_baeumenheim.conf b/domains/ffdon_baeumenheim.conf deleted file mode 100644 index afb7b21..0000000 --- a/domains/ffdon_baeumenheim.conf +++ /dev/null @@ -1,53 +0,0 @@ -{ - domain_names = { - ffdon_baeumenheim = 'Freifunk Donau-Ries Baeumenheim', - }, - domain_seed = '76ac450b2773eacadf163cee1d52992b11cd80f79f6edd049f543288da776194', - - prefix4 = '10.86.40.0/22', - prefix6 = '2a03:2260:3005:900::/64', - - wifi24 = { - channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_baeumenheim', - }, - }, - wifi5 = { - channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_baeumenheim', - }, - }, - - mesh = { - vxlan = false, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.40.1', - ip6 = '2a03:2260:3005:900::1', - mac = '02:00:0a:56:28:01', - }, - - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom09snode01.ffdon.de:20009', - 'dom09snode02.ffdon.de:20009', - }, - }, - }, - - ssid_changer = { - enabled = true, - }, -} diff --git a/domains/ffdon_donauwoerth.conf b/domains/ffdon_donauwoerth.conf deleted file mode 100644 index 51dc81c..0000000 --- a/domains/ffdon_donauwoerth.conf +++ /dev/null @@ -1,53 +0,0 @@ -{ - domain_names = { - ffdon_donauwoerth = 'Freifunk Donau-Ries Donauwoerth', - }, - domain_seed = '19628ca4709ecdf2fc2dadb9202a2a41b47b21dfc589d28b5a7e25a81e1e093d', - - prefix4 = '10.86.16.0/22', - prefix6 = '2a03:2260:3005:300::/64', - - wifi24 = { - channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_donauwoerth', - }, - }, - wifi5 = { - channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_donauwoerth', - }, - }, - - mesh = { - vxlan = false, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.16.1', - ip6 = '2a03:2260:3005:300::1', - mac = '02:00:0a:56:10:01', - }, - - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom03snode01.ffdon.de:20003', - 'dom03snode02.ffdon.de:20003', - }, - }, - }, - - ssid_changer = { - enabled = true, - }, -} diff --git a/domains/ffdon_harburg.conf b/domains/ffdon_harburg.conf deleted file mode 100644 index 2a61b37..0000000 --- a/domains/ffdon_harburg.conf +++ /dev/null @@ -1,53 +0,0 @@ -{ - domain_names = { - ffdon_harburg = 'Freifunk Donau-Ries Harburg', - }, - domain_seed = '2c3be78ee3ddebbdf247e06f386cdda58b2964fbd064473d5e6b4c138540df24', - - prefix4 = '10.86.56.0/22', - prefix6 = '2a03:2260:3005:1300::/64', - - wifi24 = { - channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_harburg', - }, - }, - wifi5 = { - channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_harburg', - }, - }, - - mesh = { - vxlan = false, - }, - - next_node = { - name = { 'knoten' }, - ip44 = '10.86.56.1', - ip6 = '2a03:2260:3005:1300::1', - mac = '02:00:0a:56:38:01', - }, - - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom13snode01.ffdon.de:20013', - 'dom13snode02.ffdon.de:20013', - }, - }, - }, - - ssid_changer = { - enabled = true, - }, -} diff --git a/domains/ffdon_mitte.conf b/domains/ffdon_mitte.conf new file mode 100644 index 0000000..625b98c --- /dev/null +++ b/domains/ffdon_mitte.conf @@ -0,0 +1,84 @@ +{ + 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 = { '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 = { + mtu = 1406, + wireguard = { + enabled = 'true', + iface = 'wg_mesh_vpn', + 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', + }, + }, + }, + + ssid_changer = { + enabled = true, + }, +} diff --git a/domains/ffdon_monheim.conf b/domains/ffdon_monheim.conf deleted file mode 100644 index 0804800..0000000 --- a/domains/ffdon_monheim.conf +++ /dev/null @@ -1,53 +0,0 @@ -{ - domain_names = { - ffdon_monheim = 'Freifunk Donau-Ries Monheim', - }, - domain_seed = '794b08e76a221a91097597dd4c6092bc1b158748c1a1307cb0b5655b2cbe4b4d', - - prefix4 = '10.86.48.0/22', - prefix6 = '2a03:2260:3005:1100::/64', - - wifi24 = { - channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_monheim', - }, - }, - wifi5 = { - channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_monheim', - }, - }, - - mesh = { - vxlan = false, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.48.1', - ip6 = '2a03:2260:3005:1100::1', - mac = '02:00:0a:56:30:01', - }, - - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom11snode01.ffdon.de:20011', - 'dom11snode02.ffdon.de:20011', - }, - }, - }, - - ssid_changer = { - enabled = true, - }, -} diff --git a/domains/ffdon_noerdlingen.conf b/domains/ffdon_noerdlingen.conf deleted file mode 100644 index 0c166bb..0000000 --- a/domains/ffdon_noerdlingen.conf +++ /dev/null @@ -1,53 +0,0 @@ -{ - domain_names = { - ffdon_noerdlingen = 'Freifunk Donau-Ries Noerdlingen', - }, - domain_seed = '62a59be11fe1fec41787c6375c48a0e1886a29703af2a08bd3c14ba82e59db31', - - prefix4 = '10.86.24.0/22', - prefix6 = '2a03:2260:3005:500::/64', - - wifi24 = { - channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_noerdlingen', - }, - }, - wifi5 = { - channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_noerdlingen', - }, - }, - - mesh = { - vxlan = false, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.24.1', - ip6 = '2a03:2260:3005:500::1', - mac = '02:00:0a:56:18:01', - }, - - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom05snode01.ffdon.de:20005', - 'dom05snode02.ffdon.de:20005', - }, - }, - }, - - ssid_changer = { - enabled = true, - }, -} diff --git a/domains/ffdon_nordwest.conf b/domains/ffdon_nordwest.conf new file mode 100644 index 0000000..d4973d2 --- /dev/null +++ b/domains/ffdon_nordwest.conf @@ -0,0 +1,83 @@ +{ + domain_names = { + ffdon_nordwest = 'Freifunk Donau-Ries - Nordwest', + ffdon_noerdlingen = 'Freifunk Donau-Ries Noerdlingen', + ffdon_oettingen = 'Freifunk Donau-Ries Oettingen', + }, + 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 = { + mtu = 1406, + wireguard = { + enabled = 'true', + iface = 'wg_mesh_vpn', + 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', + }, + }, + }, + + ssid_changer = { + enabled = true, + }, +} diff --git a/domains/ffdon_oettingen.conf b/domains/ffdon_oettingen.conf deleted file mode 100644 index 6421e8b..0000000 --- a/domains/ffdon_oettingen.conf +++ /dev/null @@ -1,53 +0,0 @@ -{ - domain_names = { - ffdon_oettingen = 'Freifunk Donau-Ries Oettingen', - }, - domain_seed = '43d3d22914b83ab94b16dfa1856703c7a40399c17e2c59a11664803f0c9edd0d', - - prefix4 = '10.86.64.0/22', - prefix6 = '2a03:2260:3005:1500::/64', - - wifi24 = { - channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_oettingen', - }, - }, - wifi5 = { - channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_oettingen', - }, - }, - - mesh = { - vxlan = false, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.64.1', - ip6 = '2a03:2260:3005:1500::1', - mac = '02:00:0a:56:40:01', - }, - - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom15snode01.ffdon.de:20015', - 'dom15snode02.ffdon.de:20015', - }, - }, - }, - - ssid_changer = { - enabled = true, - }, -} diff --git a/domains/ffdon_rain.conf b/domains/ffdon_rain.conf deleted file mode 100644 index 83a3721..0000000 --- a/domains/ffdon_rain.conf +++ /dev/null @@ -1,53 +0,0 @@ -{ - domain_names = { - ffdon_rain = 'Freifunk Donau-Ries Rain', - }, - domain_seed = '1749b2d13b1e9f5e215857c2a2bb6b29c0c0902c39204531fb743644e1866c1f', - - prefix4 = '10.86.72.0/22', - prefix6 = '2a03:2260:3005:1700::/64', - - wifi24 = { - channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_rain', - }, - }, - wifi5 = { - channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_rain', - }, - }, - - mesh = { - vxlan = false, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.72.1', - ip6 = '2a03:2260:3005:1700::1', - mac = '02:00:0a:56:48:01', - }, - - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom17snode01.ffdon.de:20017', - 'dom17snode02.ffdon.de:20017', - }, - }, - }, - - ssid_changer = { - enabled = true, - }, -} diff --git a/domains/ffdon_sued.conf b/domains/ffdon_sued.conf new file mode 100644 index 0000000..85a1404 --- /dev/null +++ b/domains/ffdon_sued.conf @@ -0,0 +1,85 @@ +{ + 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 = { '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 = { + mtu = 1406, + wireguard = { + enabled = 'true', + iface = 'wg_mesh_vpn', + 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', + }, + }, + }, + + ssid_changer = { + enabled = true, + }, +} diff --git a/domains/ffdon_umland.conf b/domains/ffdon_umland.conf deleted file mode 100644 index 652d219..0000000 --- a/domains/ffdon_umland.conf +++ /dev/null @@ -1,53 +0,0 @@ -{ - domain_names = { - ffdon_umland = 'Freifunk Donau-Ries Umland', - }, - domain_seed = '5483e62b1bdce04e5787560f08c08b1ff250590ff651c9faba2c2bc5ff5966ea', - - prefix4 = '10.86.80.0/22', - prefix6 = '2a03:2260:3005:1900::/64', - - wifi24 = { - channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_umland', - }, - }, - wifi5 = { - channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_umland', - }, - }, - - mesh = { - vxlan = false, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.80.1', - ip6 = '2a03:2260:3005:1900::1', - mac = '02:00:0a:56:50:01', - }, - - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom19snode01.ffdon.de:20019', - 'dom19snode02.ffdon.de:20019', - }, - }, - }, - - ssid_changer = { - enabled = true, - }, -} diff --git a/domains/ffdon_wemding.conf b/domains/ffdon_wemding.conf deleted file mode 100644 index 9e7ef2e..0000000 --- a/domains/ffdon_wemding.conf +++ /dev/null @@ -1,53 +0,0 @@ -{ - domain_names = { - ffdon_wemding = 'Freifunk Donau-Ries Wemding', - }, - domain_seed = 'acae56118dd203a003ac65fce8d63201d8a4db0ef4dc48b8496a6eb365bed28f', - - prefix4 = '10.86.32.0/22', - prefix6 = '2a03:2260:3005:700::/64', - - wifi24 = { - channel = 1, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_wemding', - }, - }, - wifi5 = { - channel = 44, - ap = { - ssid = 'Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_wemding', - }, - }, - - mesh = { - vxlan = false, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.32.1', - ip6 = '2a03:2260:3005:700::1', - mac = '02:00:0a:56:20:01', - }, - - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom07snode01.ffdon.de:20007', - 'dom07snode02.ffdon.de:20007', - }, - }, - }, - - ssid_changer = { - enabled = true, - }, -} diff --git a/domains/ffmuc_ffdon_test.conf b/domains/ffmuc_ffdon_test.conf deleted file mode 100644 index 857b7a1..0000000 --- a/domains/ffmuc_ffdon_test.conf +++ /dev/null @@ -1,53 +0,0 @@ -{ - domain_names = { - ffmuc_ffdon_test = 'Freifunk Donau-Ries Test' - }, - domain_seed = 'b9d58035a5a2256627a813ee9d10ebdbf53bbac562fddf240c28ed2becf4c0ec', - - prefix4 = '10.86.8.0/22', - prefix6 = '2a03:2260:3005:100::/64', - - wifi24 = { - channel = 1, - ap = { - ssid = 'TEST@Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_test', - }, - }, - wifi5 = { - channel = 44, - ap = { - ssid = 'TEST@Freifunk-Donau-Ries', - }, - mesh = { - id = 'ffdon_test', - }, - }, - - mesh = { - vxlan = false, - }, - - next_node = { - name = { 'knoten' }, - ip4 = '10.86.8.1', - ip6 = '2a03:2260:3005:100::1', - mac = '02:00:0a:56:08:01', - }, - - mesh_vpn = { - mtu = 1364, - tunneldigger = { - brokers = { - 'dom01snode01.ffdon.de:20001', - 'dom01snode02.ffdon.de:20001', - }, - }, - }, - - ssid_changer = { - enabled = true, - }, -} From e085fd0eec0ac3ae1cd1abdffd130082b6997dc7 Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Sun, 26 Nov 2023 13:38:49 +0100 Subject: [PATCH 5/5] domains: disable VXLAN meshing for now --- domains/ffdon_mitte.conf | 4 ++++ domains/ffdon_nordwest.conf | 4 ++++ domains/ffdon_sued.conf | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/domains/ffdon_mitte.conf b/domains/ffdon_mitte.conf index 625b98c..a3238bd 100644 --- a/domains/ffdon_mitte.conf +++ b/domains/ffdon_mitte.conf @@ -41,6 +41,10 @@ }, }, + mesh = { + vxlan = false, + }, + next_node = { name = { 'next.node' }, ip4 = '10.86.128.1', diff --git a/domains/ffdon_nordwest.conf b/domains/ffdon_nordwest.conf index d4973d2..75db1a7 100644 --- a/domains/ffdon_nordwest.conf +++ b/domains/ffdon_nordwest.conf @@ -40,6 +40,10 @@ }, }, + mesh = { + vxlan = false, + }, + next_node = { name = { 'next.node' }, ip4 = '10.86.136.1', diff --git a/domains/ffdon_sued.conf b/domains/ffdon_sued.conf index 85a1404..cd9cd50 100644 --- a/domains/ffdon_sued.conf +++ b/domains/ffdon_sued.conf @@ -42,6 +42,10 @@ }, }, + mesh = { + vxlan = false, + }, + next_node = { name = { 'next.node' }, ip4 = '10.86.144.1',