Required changed for Gluon v2022.x (wireguard abstraction to gluon)

domains/ffrgb_cty.conf

@@ -1,10 +1,18 @@
 {
-  domain_names = { ffrgb_cty = 'Regensburg Stadt' },
+  domain_names = { 
+    ffrgb_cty = 'Regensburg Stadt' 
+  },
+
   domain_seed = '1124de9b0fe2dde424c8a4c481816b5899e6d1b4b4cf72de42136c4f1f197c7a',
 
   prefix4 = '10.90.32.0/19',
   prefix6 = 'fdef:f10f:1337:cafe::/64',
-  extra_prefixes6 = {'2a00:9d80:6000:0101::/64', '2001:678:ddc:11::/64', '2001:678:e64:12::/64'},
+
+  extra_prefixes6 = {
+    '2a00:9d80:6000:0101::/64', 
+    '2001:678:ddc:11::/64', 
+    '2001:678:e64:12::/64'
+  },
 
   wifi24 = {
     channel = 1,
@@ -50,8 +58,8 @@
   },
 
   mesh_vpn = {
-    mtu = 1312,
     wireguard = {
+      mtu = 1312,
       enabled = 'true',
       iface = 'wg_mesh_vpn',
       limit = '1', -- actually unused
@@ -64,37 +72,6 @@
         },
       },
     },
-    fastd = {
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            gwpri = {   --[[ primary ]]
-              key = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd',
-              remotes = {
-                '"gw11.ffrgb.net" port 10010',
-                '"gw11.ffrgb.net" port 10011',
-                '"gw11.ffrgb.net" port 10012',
-                '"gw11.regensburg.freifunk.net" port 10010',
-                '"gw11.regensburg.freifunk.net" port 10011',
-                '"gw11.regensburg.freifunk.net" port 10012',
-              },
-            },
-            gwsec = {   --[[ coldstandby ]]
-              key = '0000000000000000000000000000000000000000000000000000000000000000',
-              remotes = {
-                '"gw12.ffrgb.net" port 10010',
-                '"gw12.ffrgb.net" port 10012',
-                '"gw12.ffrgb.net" port 10011',
-                '"gw12.regensburg.freifunk.net" port 10010',
-                '"gw12.regensburg.freifunk.net" port 10011',
-                '"gw12.regensburg.freifunk.net" port 10012',
-              },
-            },
-          },
-        },
-      },
-    },
   },
 
   autoupdater = {

domains/ffrgb_tst.conf

@@ -65,37 +65,6 @@
         },
       },
     },
-    fastd = {
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            gwpri = {   --[[ primary ]]
-              key = '377e0246271bfbf4c99c2d156ee0eb77c16bb5629841fde507cfab6760162b61',
-              remotes = {
-                '"gw31.ffrgb.net" port 10030',
-                '"gw31.ffrgb.net" port 10031',
-                '"gw31.ffrgb.net" port 10032',
-                '"gw31.regensburg.freifunk.net" port 10030',
-                '"gw31.regensburg.freifunk.net" port 10031',
-                '"gw31.regensburg.freifunk.net" port 10032',
-              },
-            },
-            gwsec = {   --[[ coldstandby ]]
-              key = '0000000000000000000000000000000000000000000000000000000000000000',
-              remotes = {
-                '"gw32.ffrgb.net" port 10030',
-                '"gw32.ffrgb.net" port 10031',
-                '"gw32.ffrgb.net" port 10032',
-                '"gw32.regensburg.freifunk.net" port 10030',
-                '"gw32.regensburg.freifunk.net" port 10031',
-                '"gw32.regensburg.freifunk.net" port 10032',
-              },
-            },
-          },
-        },
-      },
-    },
   },
 
   autoupdater = {

domains/ffrgb_uml.conf

@@ -64,37 +64,6 @@
         },
       },
     },
-    fastd = {
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            gwpri = {   --[[ primary ]]
-              key = '0dd861f1725bb5562f96fec8a906440c1965d1b1f8a88663dea834e523d788ea',
-              remotes = {
-                '"gw21.ffrgb.net" port 10020',
-                '"gw21.ffrgb.net" port 10021',
-                '"gw21.ffrgb.net" port 10022',
-                '"gw21.regensburg.freifunk.net" port 10020',
-                '"gw21.regensburg.freifunk.net" port 10021',
-                '"gw21.regensburg.freifunk.net" port 10022',
-              },
-            },
-            gwsec = {   --[[ coldstandby ]]
-              key = '0000000000000000000000000000000000000000000000000000000000000000',
-              remotes = {
-                '"gw22.ffrgb.net" port 10020',
-                '"gw22.ffrgb.net" port 10021',
-                '"gw22.ffrgb.net" port 10022',
-                '"gw22.regensburg.freifunk.net" port 10020',
-                '"gw22.regensburg.freifunk.net" port 10021',
-                '"gw22.regensburg.freifunk.net" port 10022',
-              },
-            },
-          },
-        },
-      },
-    },
   },
 
   autoupdater = {

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=bba683a8ec1e1f42ad2dd44c56625f05b6fdbf8b
+PACKAGES_COMMUNITY_COMMIT=1f881ed91906e221bf5c018780a546562e3c758a

site.conf

@@ -14,11 +14,6 @@
   regdom = 'DE',
 
   mesh_vpn = {
-    mtu = 1426,
-    fastd = {
-      configurable = true,
-      methods = {'salsa2012+umac'},
-    },
     bandwidth_limit = {
       enabled = false,
       ingress = 12000,