From 9225d1bafc47e3ec1f7d007de3603db1fe4e8605 Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Fri, 15 Mar 2024 12:56:00 +0100 Subject: [PATCH] modules: wgkex loadbalancing with ffmuc-mesh-vpn The new version of ffmuc-mesh-vpn-wireguard-vxlan supports load-balancing of clients using wgkex. For details, see - https://github.com/freifunkMUC/wgkex/pull/87 - https://github.com/freifunk-gluon/community-packages/pull/100 - https://github.com/freifunk-gluon/community-packages/pull/101 - https://github.com/freifunk-gluon/community-packages/pull/102 --- domains/ffdon_mitte.conf | 7 ++++--- domains/ffdon_nordwest.conf | 7 ++++--- domains/ffdon_sued.conf | 7 ++++--- domains/ffmuc_augsburg.conf | 7 ++++--- domains/ffmuc_freising.conf | 7 ++++--- domains/ffmuc_gauting.conf | 7 ++++--- domains/ffmuc_muc_cty.conf | 7 ++++--- domains/ffmuc_muc_nord.conf | 7 ++++--- domains/ffmuc_muc_ost.conf | 7 ++++--- domains/ffmuc_muc_sued.conf | 7 ++++--- domains/ffmuc_muc_west.conf | 7 ++++--- domains/ffmuc_uml_nord.conf | 7 ++++--- domains/ffmuc_uml_ost.conf | 7 ++++--- domains/ffmuc_uml_sued.conf | 7 ++++--- domains/ffmuc_uml_west.conf | 7 ++++--- domains/ffmuc_welt.conf | 7 ++++--- domains/ffwert_city.conf | 7 ++++--- domains/ffwert_events.conf | 7 ++++--- 18 files changed, 72 insertions(+), 54 deletions(-) diff --git a/domains/ffdon_mitte.conf b/domains/ffdon_mitte.conf index b5bb3ee0..3c4b75f9 100644 --- a/domains/ffdon_mitte.conf +++ b/domains/ffdon_mitte.conf @@ -48,10 +48,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffdon_nordwest.conf b/domains/ffdon_nordwest.conf index 6f44c10c..cc663beb 100644 --- a/domains/ffdon_nordwest.conf +++ b/domains/ffdon_nordwest.conf @@ -48,10 +48,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffdon_sued.conf b/domains/ffdon_sued.conf index 255cd850..fa396625 100644 --- a/domains/ffdon_sued.conf +++ b/domains/ffdon_sued.conf @@ -48,10 +48,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_augsburg.conf b/domains/ffmuc_augsburg.conf index ef496b58..44b8a643 100644 --- a/domains/ffmuc_augsburg.conf +++ b/domains/ffmuc_augsburg.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_freising.conf b/domains/ffmuc_freising.conf index bc77edda..2acbbc4a 100644 --- a/domains/ffmuc_freising.conf +++ b/domains/ffmuc_freising.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_gauting.conf b/domains/ffmuc_gauting.conf index 3dd4efb5..30829b90 100644 --- a/domains/ffmuc_gauting.conf +++ b/domains/ffmuc_gauting.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_muc_cty.conf b/domains/ffmuc_muc_cty.conf index b022c7d6..9441c8b4 100644 --- a/domains/ffmuc_muc_cty.conf +++ b/domains/ffmuc_muc_cty.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_muc_nord.conf b/domains/ffmuc_muc_nord.conf index 156d36d3..ecdc8327 100644 --- a/domains/ffmuc_muc_nord.conf +++ b/domains/ffmuc_muc_nord.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_muc_ost.conf b/domains/ffmuc_muc_ost.conf index f8fb0c26..ae0c3c3b 100644 --- a/domains/ffmuc_muc_ost.conf +++ b/domains/ffmuc_muc_ost.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_muc_sued.conf b/domains/ffmuc_muc_sued.conf index ad4c6cc0..d21ed632 100644 --- a/domains/ffmuc_muc_sued.conf +++ b/domains/ffmuc_muc_sued.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_muc_west.conf b/domains/ffmuc_muc_west.conf index 43d76ce3..08032639 100644 --- a/domains/ffmuc_muc_west.conf +++ b/domains/ffmuc_muc_west.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_uml_nord.conf b/domains/ffmuc_uml_nord.conf index 3fc69f4f..2e781e2d 100644 --- a/domains/ffmuc_uml_nord.conf +++ b/domains/ffmuc_uml_nord.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_uml_ost.conf b/domains/ffmuc_uml_ost.conf index 767f9b63..e73e6c38 100644 --- a/domains/ffmuc_uml_ost.conf +++ b/domains/ffmuc_uml_ost.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_uml_sued.conf b/domains/ffmuc_uml_sued.conf index 4f947262..cc286082 100644 --- a/domains/ffmuc_uml_sued.conf +++ b/domains/ffmuc_uml_sued.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_uml_west.conf b/domains/ffmuc_uml_west.conf index 3ceea6d4..3c003ccd 100644 --- a/domains/ffmuc_uml_west.conf +++ b/domains/ffmuc_uml_west.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffmuc_welt.conf b/domains/ffmuc_welt.conf index 63e77429..fed8d042 100644 --- a/domains/ffmuc_welt.conf +++ b/domains/ffmuc_welt.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffwert_city.conf b/domains/ffwert_city.conf index bc996b5d..d804c742 100644 --- a/domains/ffwert_city.conf +++ b/domains/ffwert_city.conf @@ -47,10 +47,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=', diff --git a/domains/ffwert_events.conf b/domains/ffwert_events.conf index b782631d..8da8d578 100644 --- a/domains/ffwert_events.conf +++ b/domains/ffwert_events.conf @@ -48,10 +48,11 @@ mesh_vpn = { mtu = 1406, wireguard = { - enabled = 'true', + enabled = true, iface = 'wg_mesh_vpn', - limit = '1', -- actually unused - broker = 'broker.ffmuc.net/api/v1/wg/key/exchange', + mtu = 1406, + broker = 'broker.ffmuc.net', + loadbalancing = 'on-by-default', peers = { { publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=',