From f85fe54d725977ac0bfcd5a3cbaf312bb0d0a732 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.

See https://github.com/freifunkMUC/wgkex/pull/87 for details.
---
 domains/ffdon_mitte.conf    | 6 +++---
 domains/ffdon_nordwest.conf | 6 +++---
 domains/ffdon_sued.conf     | 6 +++---
 domains/ffmuc_augsburg.conf | 6 +++---
 domains/ffmuc_freising.conf | 6 +++---
 domains/ffmuc_gauting.conf  | 6 +++---
 domains/ffmuc_muc_cty.conf  | 6 +++---
 domains/ffmuc_muc_nord.conf | 6 +++---
 domains/ffmuc_muc_ost.conf  | 6 +++---
 domains/ffmuc_muc_sued.conf | 6 +++---
 domains/ffmuc_muc_west.conf | 6 +++---
 domains/ffmuc_uml_nord.conf | 6 +++---
 domains/ffmuc_uml_ost.conf  | 6 +++---
 domains/ffmuc_uml_sued.conf | 6 +++---
 domains/ffmuc_uml_west.conf | 6 +++---
 domains/ffmuc_welt.conf     | 6 +++---
 domains/ffwert_city.conf    | 6 +++---
 domains/ffwert_events.conf  | 6 +++---
 modules                     | 2 +-
 19 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/domains/ffdon_mitte.conf b/domains/ffdon_mitte.conf
index 4fafa9cb..01815454 100644
--- a/domains/ffdon_mitte.conf
+++ b/domains/ffdon_mitte.conf
@@ -47,11 +47,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 a2532485..ee4c8803 100644
--- a/domains/ffdon_nordwest.conf
+++ b/domains/ffdon_nordwest.conf
@@ -47,11 +47,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 cea7f836..57f87436 100644
--- a/domains/ffdon_sued.conf
+++ b/domains/ffdon_sued.conf
@@ -47,11 +47,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 1f7a95f4..41837052 100644
--- a/domains/ffmuc_augsburg.conf
+++ b/domains/ffmuc_augsburg.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 fc750bc6..336a3a49 100644
--- a/domains/ffmuc_freising.conf
+++ b/domains/ffmuc_freising.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 b4c01594..f6979e1f 100644
--- a/domains/ffmuc_gauting.conf
+++ b/domains/ffmuc_gauting.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 8fb3d664..b5062e5d 100644
--- a/domains/ffmuc_muc_cty.conf
+++ b/domains/ffmuc_muc_cty.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 f473d021..8f2253c8 100644
--- a/domains/ffmuc_muc_nord.conf
+++ b/domains/ffmuc_muc_nord.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 e1316a95..68af4f3f 100644
--- a/domains/ffmuc_muc_ost.conf
+++ b/domains/ffmuc_muc_ost.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 514f5679..0e05448e 100644
--- a/domains/ffmuc_muc_sued.conf
+++ b/domains/ffmuc_muc_sued.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 1c997c7b..945a1d58 100644
--- a/domains/ffmuc_muc_west.conf
+++ b/domains/ffmuc_muc_west.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 9e299c5c..4f30a23d 100644
--- a/domains/ffmuc_uml_nord.conf
+++ b/domains/ffmuc_uml_nord.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 2c525b9c..47a35c3e 100644
--- a/domains/ffmuc_uml_ost.conf
+++ b/domains/ffmuc_uml_ost.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 0f1070b1..c36210f0 100644
--- a/domains/ffmuc_uml_sued.conf
+++ b/domains/ffmuc_uml_sued.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 61386de7..9e37453b 100644
--- a/domains/ffmuc_uml_west.conf
+++ b/domains/ffmuc_uml_west.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 ec6f74ed..c2fa440b 100644
--- a/domains/ffmuc_welt.conf
+++ b/domains/ffmuc_welt.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 a77c140f..5590c4f5 100644
--- a/domains/ffwert_city.conf
+++ b/domains/ffwert_city.conf
@@ -46,11 +46,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      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 e615f01f..0ad5b2e7 100644
--- a/domains/ffwert_events.conf
+++ b/domains/ffwert_events.conf
@@ -47,11 +47,11 @@
 
   mesh_vpn = {
     wireguard = {
-      enabled = 'true',
+      enabled = true,
       iface = 'wg_mesh_vpn',
       mtu = 1406,
-      limit = '1', -- actually unused
-      broker = 'broker.ffmuc.net/api/v1/wg/key/exchange',
+      broker = 'broker.ffmuc.net',
+      loadbalancing = 'on-by-default',
       peers = {
         {
           publickey ='TszFS3oFRdhsJP3K0VOlklGMGYZy+oFCtlaghXJqW2g=',
diff --git a/modules b/modules
index 16213081..26012592 100644
--- a/modules
+++ b/modules
@@ -9,5 +9,5 @@
 GLUON_SITE_FEEDS='community'
 
 PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
-PACKAGES_COMMUNITY_COMMIT=d021daffe6d7a880b098152c1e9edc3c662988b6
+PACKAGES_COMMUNITY_COMMIT=e54d2df0995cbc4a12e90b0c3f140bad6eb8da29
 PACKAGES_COMMUNITY_BRANCH=master