From 24a8d6dff947aee19d23d3026c402e8f0be8636d Mon Sep 17 00:00:00 2001 From: Bastian Date: Mon, 16 Nov 2020 23:03:33 +0000 Subject: [PATCH 01/16] Added Domainconfig to Test-gw --- domains/ffrgb_tst.conf | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index b938fb6..043ceab 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -54,6 +54,18 @@ mesh_vpn = { mtu = 1312, + wireguard = { + enabled = 'true', + iface = 'wg_mesh_vpn', + limit = '1', -- actually unused + peers = { + { + publickey ='SfVwYUjy2b9AZ+R/JTwmLXz5jm1UEmnfuRMGpN9B4X4=', + endpoint ='gw31.ffrgb.net:40001', + link_address='fdef:f30f:2342:cafe::31', + }, + }, + }, fastd = { groups = { backbone = { From 82625076c9f083a04d596d77a416a2b32daada09 Mon Sep 17 00:00:00 2001 From: Bastian Date: Mon, 16 Nov 2020 23:09:05 +0000 Subject: [PATCH 02/16] Add community package feed for VXoWG --- modules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules b/modules index 6e15995..0f2e7ea 100644 --- a/modules +++ b/modules @@ -1,4 +1,6 @@ -GLUON_SITE_FEEDS='ffrgb' +GLUON_SITE_FEEDS='ffrgb community' PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git PACKAGES_FFRGB_BRANCH=master PACKAGES_FFRGB_COMMIT=af2c608f31e264a279b919814896e4470c455e72 +PACKAGES_COMMUNITY_REPO=https://github.com/ffrgb/community-packages.git +PACKAGES_COMMUNITY_COMMIT=3a431c1dc88a083612f9f4ffb121520ee6d58651 From d2ccca6ac75d612bfa91087fc14f99b9bcf1bd4e Mon Sep 17 00:00:00 2001 From: Bastian Date: Tue, 17 Nov 2020 13:28:42 +0000 Subject: [PATCH 03/16] wip: testbuild --- Makefile | 4 +++- modules | 1 + site.mk | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 17ea1be..336d91d 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,9 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ - ar71xx-generic \ + x86-64 \ + x86-generic \ +# ar71xx-generic \ ar71xx-tiny \ ar71xx-nand \ ath79-generic \ diff --git a/modules b/modules index 0f2e7ea..ed9f477 100644 --- a/modules +++ b/modules @@ -3,4 +3,5 @@ PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git PACKAGES_FFRGB_BRANCH=master PACKAGES_FFRGB_COMMIT=af2c608f31e264a279b919814896e4470c455e72 PACKAGES_COMMUNITY_REPO=https://github.com/ffrgb/community-packages.git +PACKAGES_COMMUNITY_BRANCH=gluon-mesh-vpn-wireguard-vxlan PACKAGES_COMMUNITY_COMMIT=3a431c1dc88a083612f9f4ffb121520ee6d58651 diff --git a/site.mk b/site.mk index 4f654d3..6e83701 100644 --- a/site.mk +++ b/site.mk @@ -16,7 +16,6 @@ GLUON_SITE_PACKAGES := \ gluon-web-autoupdater \ gluon-web-network \ gluon-web-wifi-config \ - gluon-web-mesh-vpn-fastd \ gluon-web-private-wifi \ gluon-radvd \ gluon-setup-mode \ @@ -26,6 +25,7 @@ GLUON_SITE_PACKAGES := \ iptables \ gluon-ssid-changer \ respondd-module-airtime \ + gluon-mesh-vpn-wireguard-vxlan \ ffrgb-banner #\ #ffho-site-generate \ #ffho-config-mode-site-select \ From be887cb984896933ad4fe76210d1bda5b4bc83cf Mon Sep 17 00:00:00 2001 From: Bastian Date: Tue, 17 Nov 2020 14:14:17 +0000 Subject: [PATCH 04/16] wip: update package feed commit id --- Makefile | 2 +- modules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 336d91d..580ec6d 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ x86-64 \ - x86-generic \ +# x86-generic \ # ar71xx-generic \ ar71xx-tiny \ ar71xx-nand \ diff --git a/modules b/modules index ed9f477..a7c73e3 100644 --- a/modules +++ b/modules @@ -4,4 +4,4 @@ PACKAGES_FFRGB_BRANCH=master PACKAGES_FFRGB_COMMIT=af2c608f31e264a279b919814896e4470c455e72 PACKAGES_COMMUNITY_REPO=https://github.com/ffrgb/community-packages.git PACKAGES_COMMUNITY_BRANCH=gluon-mesh-vpn-wireguard-vxlan -PACKAGES_COMMUNITY_COMMIT=3a431c1dc88a083612f9f4ffb121520ee6d58651 +PACKAGES_COMMUNITY_COMMIT=8be9c94fc7be4c9fc6fdae2e969b86dcc268fa1e From b1f4879de018d5386bb7a3bc7ed126a19ad2b3db Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 22 Nov 2020 18:37:27 +0000 Subject: [PATCH 05/16] Use 2020.2.2, add broker entpoind host --- Makefile | 2 +- domains/ffrgb_tst.conf | 3 ++- site.mk | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 580ec6d..ce4eb29 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon -GLUON_GIT_REF := v2020.2.1 +GLUON_GIT_REF := 21151062af4a0141ad6c6855682ff5de255db146 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index 043ceab..79ed737 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -62,7 +62,8 @@ { publickey ='SfVwYUjy2b9AZ+R/JTwmLXz5jm1UEmnfuRMGpN9B4X4=', endpoint ='gw31.ffrgb.net:40001', - link_address='fdef:f30f:2342:cafe::31', + broker ='gw31.ffrgb.net', + link_address='fe80::31', }, }, }, diff --git a/site.mk b/site.mk index 6e83701..933ca90 100644 --- a/site.mk +++ b/site.mk @@ -5,7 +5,6 @@ GLUON_SITE_PACKAGES := \ gluon-config-mode-core \ gluon-config-mode-autoupdater \ gluon-config-mode-hostname \ - gluon-config-mode-mesh-vpn \ gluon-config-mode-domain-select \ gluon-config-mode-geo-location \ gluon-config-mode-contact-info \ From e222d2db45fc8f2f3caaf622f3566bcfb2c60dfe Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 22 Nov 2020 18:44:27 +0000 Subject: [PATCH 06/16] bump community package feeed --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index a7c73e3..2a6fd06 100644 --- a/modules +++ b/modules @@ -4,4 +4,4 @@ PACKAGES_FFRGB_BRANCH=master PACKAGES_FFRGB_COMMIT=af2c608f31e264a279b919814896e4470c455e72 PACKAGES_COMMUNITY_REPO=https://github.com/ffrgb/community-packages.git PACKAGES_COMMUNITY_BRANCH=gluon-mesh-vpn-wireguard-vxlan -PACKAGES_COMMUNITY_COMMIT=8be9c94fc7be4c9fc6fdae2e969b86dcc268fa1e +PACKAGES_COMMUNITY_COMMIT=d5af247c349314ba6e870700f2da668366fd7c0f From a74c42f18b7ed1fc5a31bd547d2c2efc1354c00c Mon Sep 17 00:00:00 2001 From: Bastian Date: Sat, 8 May 2021 20:17:10 +0000 Subject: [PATCH 07/16] VXLAN Test --- Makefile | 5 ++--- domains/ffrgb_tst.conf | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ce4eb29..c52ab6f 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,8 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ - x86-64 \ -# x86-generic \ -# ar71xx-generic \ + x86-generic \ + ar71xx-generic \ ar71xx-tiny \ ar71xx-nand \ ath79-generic \ diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index 79ed737..483df8c 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -24,7 +24,7 @@ channel = 44, htmode = 'HT20', ap = { - ssid = 'test.freifunk.net', + ssid = 'test.ffrgb.net', }, mesh = { id = 'mesh_ffrgb_tst_11s', From 8888177535e6e12a1dc39a041c1ff02a9f910d25 Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Fri, 23 Jul 2021 16:54:06 +0200 Subject: [PATCH 08/16] update wireguard endpoints and pubkeys --- domains/ffrgb_cty.conf | 13 +++++++++++++ domains/ffrgb_tst.conf | 4 ++-- domains/ffrgb_uml.conf | 13 +++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf index fe27eac..ac467df 100644 --- a/domains/ffrgb_cty.conf +++ b/domains/ffrgb_cty.conf @@ -53,6 +53,19 @@ mesh_vpn = { mtu = 1312, + wireguard = { + enabled = 'true', + iface = 'wg_mesh_vpn', + limit = '1', -- actually unused + peers = { + { + publickey ='zqBVQJlzkZxk5YT04dv4cIrYoDYpx0xBxK/6gV2PZXE=', + endpoint ='gw11.ffrgb.net:20010', + broker ='gw11.ffrgb.net', + link_address='fe80::11', + }, + }, + }, fastd = { groups = { backbone = { diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index 483df8c..f345b68 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -61,8 +61,8 @@ peers = { { publickey ='SfVwYUjy2b9AZ+R/JTwmLXz5jm1UEmnfuRMGpN9B4X4=', - endpoint ='gw31.ffrgb.net:40001', - broker ='gw31.ffrgb.net', + endpoint ='gw31.ffrgb.net:20030', + broker ='gw31.ffrgb.net', link_address='fe80::31', }, }, diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf index 4093b28..0ac1576 100644 --- a/domains/ffrgb_uml.conf +++ b/domains/ffrgb_uml.conf @@ -53,6 +53,19 @@ mesh_vpn = { mtu = 1312, + wireguard = { + enabled = 'true', + iface = 'wg_mesh_vpn', + limit = '1', -- actually unused + peers = { + { + publickey ='MqzXEqO4US16rSGxsF2oHuSdMAy/Qimy+GUSeCob+U0=', + endpoint ='gw21.ffrgb.net:20020', + broker ='gw21.ffrgb.net', + link_address='fe80::21', + }, + }, + }, fastd = { groups = { backbone = { From 343f062428f5ebf8336019dfea7beea3a65b9d58 Mon Sep 17 00:00:00 2001 From: Bastian Date: Sat, 24 Jul 2021 23:24:40 +0000 Subject: [PATCH 09/16] Update Gluon to v2021.1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c52ab6f..189836c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon -GLUON_GIT_REF := 21151062af4a0141ad6c6855682ff5de255db146 +GLUON_GIT_REF := v2021.1 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 2168b819d32e781dc6489c365b2f7e28bb3a3431 Mon Sep 17 00:00:00 2001 From: Bastian Date: Tue, 27 Jul 2021 08:55:39 +0000 Subject: [PATCH 10/16] Update Community feed --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 2a6fd06..7a46b30 100644 --- a/modules +++ b/modules @@ -4,4 +4,4 @@ PACKAGES_FFRGB_BRANCH=master PACKAGES_FFRGB_COMMIT=af2c608f31e264a279b919814896e4470c455e72 PACKAGES_COMMUNITY_REPO=https://github.com/ffrgb/community-packages.git PACKAGES_COMMUNITY_BRANCH=gluon-mesh-vpn-wireguard-vxlan -PACKAGES_COMMUNITY_COMMIT=d5af247c349314ba6e870700f2da668366fd7c0f +PACKAGES_COMMUNITY_COMMIT=ee3c16fab6420e4901694269c68d9db6b5e2963c From 231417fc52c53d57e6dcc9233ddd11da5b63b691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20M=C3=A4user?= Date: Mon, 9 Aug 2021 13:43:51 +0200 Subject: [PATCH 11/16] New Wireguard Packages feed --- .gitignore | 1 + modules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..eed73e6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +site-ffrgb.code-workspace diff --git a/modules b/modules index 7a46b30..fd61c6d 100644 --- a/modules +++ b/modules @@ -4,4 +4,4 @@ PACKAGES_FFRGB_BRANCH=master PACKAGES_FFRGB_COMMIT=af2c608f31e264a279b919814896e4470c455e72 PACKAGES_COMMUNITY_REPO=https://github.com/ffrgb/community-packages.git PACKAGES_COMMUNITY_BRANCH=gluon-mesh-vpn-wireguard-vxlan -PACKAGES_COMMUNITY_COMMIT=ee3c16fab6420e4901694269c68d9db6b5e2963c +PACKAGES_COMMUNITY_COMMIT=136de429e1545aeb49a1833002e7a7776c688aec From ea050a19a09009384020617874d40d8d375bde5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20M=C3=A4user?= Date: Mon, 9 Aug 2021 14:58:39 +0200 Subject: [PATCH 12/16] Add gluon-config-mode-mesh-vpn --- site.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/site.mk b/site.mk index 933ca90..e3edb2b 100644 --- a/site.mk +++ b/site.mk @@ -8,6 +8,7 @@ GLUON_SITE_PACKAGES := \ gluon-config-mode-domain-select \ gluon-config-mode-geo-location \ gluon-config-mode-contact-info \ + gluon-config-mode-mesh-vpn \ gluon-ebtables-filter-multicast \ gluon-ebtables-filter-ra-dhcp \ gluon-ebtables-source-filter \ From 6f9782b2d1dbd298ad33662d77752ed058763cb9 Mon Sep 17 00:00:00 2001 From: Bastian Date: Wed, 11 Aug 2021 14:26:22 +0000 Subject: [PATCH 13/16] New Package feed --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index fd61c6d..8164b17 100644 --- a/modules +++ b/modules @@ -4,4 +4,4 @@ PACKAGES_FFRGB_BRANCH=master PACKAGES_FFRGB_COMMIT=af2c608f31e264a279b919814896e4470c455e72 PACKAGES_COMMUNITY_REPO=https://github.com/ffrgb/community-packages.git PACKAGES_COMMUNITY_BRANCH=gluon-mesh-vpn-wireguard-vxlan -PACKAGES_COMMUNITY_COMMIT=136de429e1545aeb49a1833002e7a7776c688aec +PACKAGES_COMMUNITY_COMMIT=43289c587312cb896a71a327b6a0972498dc76aa From 3f53397b5783f796a51cf1cab923fd98a5a6d520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20M=C3=A4user?= Date: Wed, 11 Aug 2021 16:27:53 +0200 Subject: [PATCH 14/16] Integrate external NTP Server --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index d5de36a..caf18a4 100644 --- a/site.conf +++ b/site.conf @@ -9,7 +9,7 @@ }, timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', - ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'}, + ntp_servers = {'ntp.ffrgb.net'}, mesh_on_wan = false, From 8eb1336593b8e9eb48d6ab812c35bed565a4139f Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 15 Aug 2021 12:40:32 +0000 Subject: [PATCH 15/16] Remove NTP from Domain config --- domains/ffrgb_cty.conf | 2 -- domains/ffrgb_tst.conf | 2 -- domains/ffrgb_uml.conf | 2 -- 3 files changed, 6 deletions(-) diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf index ac467df..a228753 100644 --- a/domains/ffrgb_cty.conf +++ b/domains/ffrgb_cty.conf @@ -6,8 +6,6 @@ prefix6 = 'fdef:f10f:1337:cafe::/64', extra_prefixes6 = {'2a00:9d80:6000:0101::/64', '2001:678:ddc:11::/64', '2001:678:e64:12::/64'}, - ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'}, - wifi24 = { channel = 1, htmode = 'HT20', diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index f345b68..4ad4b02 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -7,8 +7,6 @@ prefix6 = 'fdef:f30f:1337:cafe::/64', extra_prefixes6 = {'2a00:9d80:6000:0103::/64', '2001:678:ddc:31::/64', '2001:678:e64:32::/64'}, - ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'}, - wifi24 = { channel = 1, htmode = 'HT20', diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf index 0ac1576..3cf3944 100644 --- a/domains/ffrgb_uml.conf +++ b/domains/ffrgb_uml.conf @@ -6,8 +6,6 @@ prefix6 = 'fdef:f20f:1337:cafe::/64', extra_prefixes6 = {'2a00:9d80:6000:0102::/64', '2001:678:ddc:21::/64', '2001:678:e64:22::/64'}, - ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'}, - wifi24 = { channel = 1, htmode = 'HT20', From c9e8b3dd1cdfb11db94ac3f773da28bc9317d48d Mon Sep 17 00:00:00 2001 From: Bastian Date: Mon, 16 Aug 2021 09:54:40 +0000 Subject: [PATCH 16/16] Gluon v2021.1.1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 189836c..279c35a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon -GLUON_GIT_REF := v2021.1 +GLUON_GIT_REF := v2021.1.1 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key