From 79605910eb5ed930455ae3c5f94de99d1b637f36 Mon Sep 17 00:00:00 2001
From: Bob Idle <102661087+bobidle@users.noreply.github.com>
Date: Sun, 10 Mar 2024 20:16:04 +0100
Subject: [PATCH 1/4] Use spaces instead of tabs/spaces mix in conf files

---
 domains/ffef_v1.conf   | 122 +++++++++++++------------
 domains/ffen_v1.conf   | 123 +++++++++++++------------
 domains/ffgth_v1.conf  | 122 +++++++++++++------------
 domains/ffil_v1.conf   | 123 +++++++++++++------------
 domains/ffthw_v1.conf  | 122 +++++++++++++------------
 domains/ffwsee_v1.conf | 125 +++++++++++++-------------
 site.conf              | 199 ++++++++++++++++++++---------------------
 site.mk                |   2 +-
 8 files changed, 463 insertions(+), 475 deletions(-)

diff --git a/domains/ffef_v1.conf b/domains/ffef_v1.conf
index b462838..cf77bb6 100644
--- a/domains/ffef_v1.conf
+++ b/domains/ffef_v1.conf
@@ -1,72 +1,70 @@
 {
-    domain_code='ffef_v1',
-	domain_names={
-        ffef_v1='Freifunk Erfurt'
-    },
+  domain_code = 'ffef_v1',
+  domain_names = {
+    ffef_v1 = 'Freifunk Erfurt'
+  },
 
-    -- more domain specific config follows here
-    -- needed since v2018
-    -- 32 byte random data in hexadecimal encoding
-    -- This data must be unique among all sites and domains!
-    -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = '394bf993cd0fbb63a9bc834207f36cc99df532c0e76d88bd6505642fcbe3ffcf',
+  -- 32 byte random data in hexadecimal encoding
+  -- This data must be unique among all sites and domains!
+  -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
+  domain_seed = '394bf993cd0fbb63a9bc834207f36cc99df532c0e76d88bd6505642fcbe3ffcf',
 
-    -- more domain specific config follows here
-    prefix4 = '10.99.0.0/18',
-	prefix6 = 'fd0a:d928:b30d:4::/64',
+  -- more domain specific config follows here
+  prefix4 = '10.99.0.0/18',
+  prefix6 = 'fd0a:d928:b30d:4::/64',
 
-    wifi24 = {
-		channel = 1,
-		ap = {
-			ssid = 'Freifunk Erfurt',
-		},
-		mesh = {
-			id = 'mesh.erfurt.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
-    wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk Erfurt (5GHz)',
-		},
-		mesh = {
-			id = 'mesh.erfurt.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
+  wifi24 = {
+    channel = 1,
+    ap = {
+      ssid = 'Freifunk Erfurt',
+    },
+    mesh = {
+      id = 'mesh.erfurt.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
+  wifi5 = {
+    channel = 44,
+    ap = {
+      ssid = 'Freifunk Erfurt (5GHz)',
+    },
+    mesh = {
+      id = 'mesh.erfurt.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
 
-	mesh = {
-   		vxlan = false,
-		batman_adv = {
-	        	gw_sel_class = 2500,
-			routing_algo = 'BATMAN_IV',
-		},
-  	},
+  mesh = {
+    vxlan = false,
+    batman_adv = {
+      gw_sel_class = 2500,
+      routing_algo = 'BATMAN_IV',
+    },
+  },
 
-	mesh_vpn = {
+  mesh_vpn = {
 
-		mtu = 1426,
+    mtu = 1426,
 
-		fastd = {
-			methods = {'null+salsa2012+umac'},
-			groups = {
-				backbone = {
-					limit = 1,
-					peers = {					
-						vpn5 = {
-                            key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
-                            remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
-                        },
-					},
-				},
-			},
-		},
-	},
+    fastd = {
+      methods = {'null+salsa2012+umac'},
+      groups = {
+        backbone = {
+          limit = 1,
+          peers = {
+            vpn5 = {
+              key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
+              remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
+            },
+          },
+        },
+      },
+    },
+  },
 
-	next_node = {
-		ip4 = '10.99.0.1',
-		ip6 = 'fd0a:d928:b30d:4::1',
-		mac = 'ca:ff:ee:ba:be:01',
-	},
+  next_node = {
+    ip4 = '10.99.0.1',
+    ip6 = 'fd0a:d928:b30d:4::1',
+    mac = 'ca:ff:ee:ba:be:01',
+  },
 }
diff --git a/domains/ffen_v1.conf b/domains/ffen_v1.conf
index 27c7e40..e875af0 100644
--- a/domains/ffen_v1.conf
+++ b/domains/ffen_v1.conf
@@ -1,71 +1,70 @@
 {
-	domain_code = 'ffen_v1',
-    domain_names={
-        ffen_v1='Freifunk EA-WAK',
-    }, 
-    
-    -- needed since v2018
-    -- 32 byte random data in hexadecimal encoding
-    -- This data must be unique among all sites and domains!
-    -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = '394bf993cd0fbb63a9bc834207f36cc99df532c0e76d88bd6505642fcbe3ffcf',
+  domain_code = 'ffen_v1',
+  domain_names = {
+    ffen_v1 = 'Freifunk EA-WAK',
+  },
 
-    -- more domain specific config follows here
-    prefix4 = '10.99.0.0/18',
-	prefix6 = 'fd0a:d928:b30d:4::/64',
+  -- 32 byte random data in hexadecimal encoding
+  -- This data must be unique among all sites and domains!
+  -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
+  domain_seed = '394bf993cd0fbb63a9bc834207f36cc99df532c0e76d88bd6505642fcbe3ffcf',
 
-    wifi24 = {
-		channel = 1,
-		ap = {
-			ssid = 'Freifunk EA-WAK',
-		},
-		mesh = {
-			id = 'mesh.ffea_wak.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
-        wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk EA-WAK (5GHz)',
-		},
-		mesh = {
-			id = 'mesh.ffea_wak.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
+  -- more domain specific config follows here
+  prefix4 = '10.99.0.0/18',
+  prefix6 = 'fd0a:d928:b30d:4::/64',
 
-	mesh = {
-   		vxlan = false,
-		batman_adv = {
-	        	gw_sel_class = 2500,
-			routing_algo = 'BATMAN_IV',
-		},
-  	},
+  wifi24 = {
+    channel = 1,
+    ap = {
+      ssid = 'Freifunk EA-WAK',
+    },
+    mesh = {
+      id = 'mesh.ffea_wak.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
+  wifi5 = {
+    channel = 44,
+    ap = {
+      ssid = 'Freifunk EA-WAK (5GHz)',
+    },
+    mesh = {
+      id = 'mesh.ffea_wak.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
 
-	mesh_vpn = {
+  mesh = {
+    vxlan = false,
+    batman_adv = {
+      gw_sel_class = 2500,
+      routing_algo = 'BATMAN_IV',
+    },
+  },
 
-		mtu = 1426,
+  mesh_vpn = {
 
-		fastd = {
-			methods = {'null+salsa2012+umac'},
-			groups = {
-				backbone = {
-					limit = 1,
-					peers = {
-						vpn5 = {
-                            key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
-                            remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
-                        },
-					},
-				},
-			},
-		},
-	},
+    mtu = 1426,
 
-	next_node = {
-		ip4 = '10.99.0.1',
-		ip6 = 'fd0a:d928:b30d:4::1',
-		mac = 'ca:ff:ee:ba:be:01',
-	},
+    fastd = {
+      methods = {'null+salsa2012+umac'},
+      groups = {
+        backbone = {
+          limit = 1,
+          peers = {
+            vpn5 = {
+              key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
+              remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
+            },
+          },
+        },
+      },
+    },
+  },
+
+  next_node = {
+    ip4 = '10.99.0.1',
+    ip6 = 'fd0a:d928:b30d:4::1',
+    mac = 'ca:ff:ee:ba:be:01',
+  },
 }
diff --git a/domains/ffgth_v1.conf b/domains/ffgth_v1.conf
index a64f69d..f1d33bd 100644
--- a/domains/ffgth_v1.conf
+++ b/domains/ffgth_v1.conf
@@ -1,72 +1,70 @@
 {
-	domain_code = 'ffgth_v1',
-    domain_names={
-        ffgth_v1='Freifunk Gotha'
-    },
+  domain_code = 'ffgth_v1',
+  domain_names = {
+    ffgth_v1 = 'Freifunk Gotha'
+  },
 
-    -- more domain specific config follows here
-    -- needed since v2018
-    -- 32 byte random data in hexadecimal encoding
-    -- This data must be unique among all sites and domains!
-    -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-    domain_seed = '963d9f9cad09649ad7ec0a32a4cd6a4cc9b66432160bdd39794c82c3f02eecca',
+  -- 32 byte random data in hexadecimal encoding
+  -- This data must be unique among all sites and domains!
+  -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
+  domain_seed = '963d9f9cad09649ad7ec0a32a4cd6a4cc9b66432160bdd39794c82c3f02eecca',
 
-    -- more domain specific config follows here
-    prefix4 = '10.99.0.0/18',
-	prefix6 = 'fd0a:d928:b30d:4::/64',
+  -- more domain specific config follows here
+  prefix4 = '10.99.0.0/18',
+  prefix6 = 'fd0a:d928:b30d:4::/64',
 
-    wifi24 = {
-		channel = 1,
-		ap = {
-			ssid = 'Freifunk Gotha',
-		},
-		mesh = {
-			id = 'mesh.gotha.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk Gotha (5GHz)',
-		},
-		mesh = {
-			id = 'mesh5.gotha.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
+  wifi24 = {
+    channel = 1,
+    ap = {
+      ssid = 'Freifunk Gotha',
+    },
+    mesh = {
+      id = 'mesh.gotha.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
+  wifi5 = {
+    channel = 44,
+    ap = {
+      ssid = 'Freifunk Gotha (5GHz)',
+    },
+    mesh = {
+      id = 'mesh5.gotha.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
 
-	mesh = {
-   		vxlan = false,
-		batman_adv = {
-	        	gw_sel_class = 2500,
-			routing_algo = 'BATMAN_IV',
-		},
-  	},
+  mesh = {
+    vxlan = false,
+    batman_adv = {
+      gw_sel_class = 2500,
+      routing_algo = 'BATMAN_IV',
+    },
+  },
 
-	mesh_vpn = {
+  mesh_vpn = {
 
-		mtu = 1426,
+    mtu = 1426,
 
-		fastd = {
-			methods = {'null+salsa2012+umac'},
-			groups = {
-				backbone = {
-					limit = 1,
-					peers = {
-						vpn5 = {
-                            key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
-                            remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
-                        },
-					},
-				},
-			},
-		},
-	},
+    fastd = {
+      methods = {'null+salsa2012+umac'},
+      groups = {
+        backbone = {
+          limit = 1,
+          peers = {
+            vpn5 = {
+              key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
+              remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
+            },
+          },
+        },
+      },
+    },
+  },
 
-	next_node = {
-		ip4 = '10.99.0.1',
-		ip6 = 'fd0a:d928:b30d:4::1',
-		mac = 'ca:ff:ee:ba:be:01',
-	},
+  next_node = {
+    ip4 = '10.99.0.1',
+    ip6 = 'fd0a:d928:b30d:4::1',
+    mac = 'ca:ff:ee:ba:be:01',
+  },
 }
diff --git a/domains/ffil_v1.conf b/domains/ffil_v1.conf
index 8d1b401..db5f6b7 100644
--- a/domains/ffil_v1.conf
+++ b/domains/ffil_v1.conf
@@ -1,73 +1,70 @@
 {
-    domain_code = 'ffil_v1',
-    domain_names={
-        ffil_v1='Freifunk Ilmenau'
-    },
+  domain_code = 'ffil_v1',
+  domain_names = {
+    ffil_v1 = 'Freifunk Ilmenau'
+  },
 
-    -- more domain specific config follows here
-    -- needed since v2018
-    -- 32 byte random data in hexadecimal encoding
-    -- This data must be unique among all sites and domains!
-    -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-    domain_seed = '417691b0089f7dbc98fe046bb89e15a788edc52047e29ed528cd4b6277525b42',
+  -- 32 byte random data in hexadecimal encoding
+  -- This data must be unique among all sites and domains!
+  -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
+  domain_seed = '417691b0089f7dbc98fe046bb89e15a788edc52047e29ed528cd4b6277525b42',
 
-    -- more domain specific config follows here
-    prefix4 = '10.99.0.0/18',
-	prefix6 = 'fd0a:d928:b30d:4::/64',
+  -- more domain specific config follows here
+  prefix4 = '10.99.0.0/18',
+  prefix6 = 'fd0a:d928:b30d:4::/64',
 
-    wifi24 = {
-		channel = 6,
-		ap = {
-			ssid = 'Freifunk Ilmenau',
-		},
-		mesh = {
-			id = 'mesh.ilmenau.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk Ilmenau (5GHz)',
-		},
-		mesh = {
-			id = 'mesh5.ilmenau.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
+  wifi24 = {
+    channel = 6,
+    ap = {
+      ssid = 'Freifunk Ilmenau',
+    },
+    mesh = {
+      id = 'mesh.ilmenau.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
+  wifi5 = {
+    channel = 44,
+    ap = {
+      ssid = 'Freifunk Ilmenau (5GHz)',
+    },
+    mesh = {
+      id = 'mesh5.ilmenau.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
 
-	mesh = {
-   		vxlan = false,
-		batman_adv = {
-	        	gw_sel_class = 2500,
-			routing_algo = 'BATMAN_IV',
-		},
-  	},
+  mesh = {
+    vxlan = false,
+    batman_adv = {
+      gw_sel_class = 2500,
+      routing_algo = 'BATMAN_IV',
+    },
+  },
 
-	mesh_vpn = {
+  mesh_vpn = {
 
-		mtu = 1426,
+    mtu = 1426,
 
-		fastd = {
-			methods = {'null+salsa2012+umac'},
-			groups = {
-				backbone = {
-					limit = 1,
-					peers = {
-						vpn5 = {
-                            key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
-                            remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
-                        },
-					},
-				},
-			},
-		},
-		
-	},
+    fastd = {
+      methods = {'null+salsa2012+umac'},
+      groups = {
+        backbone = {
+          limit = 1,
+          peers = {
+            vpn5 = {
+              key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
+              remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
+            },
+          },
+        },
+      },
+    },
+  },
 
-	next_node = {
-		ip4 = '10.99.0.1',
-		ip6 = 'fd0a:d928:b30d:4::1',
-		mac = 'ca:ff:ee:ba:be:01',
-	},
+  next_node = {
+    ip4 = '10.99.0.1',
+    ip6 = 'fd0a:d928:b30d:4::1',
+    mac = 'ca:ff:ee:ba:be:01',
+  },
 }
diff --git a/domains/ffthw_v1.conf b/domains/ffthw_v1.conf
index 95b74b3..3213a20 100644
--- a/domains/ffthw_v1.conf
+++ b/domains/ffthw_v1.conf
@@ -1,72 +1,70 @@
 {
-	domain_code = 'ffthw_v1',
-    domain_names={
-        ffthw_v1='Freifunk THW Erfurt (THW only)'
-    },
+  domain_code = 'ffthw_v1',
+  domain_names = {
+    ffthw_v1 = 'Freifunk THW Erfurt (THW only)'
+  },
 
-    -- more domain specific config follows here
-    -- needed since v2018
-    -- 32 byte random data in hexadecimal encoding
-    -- This data must be unique among all sites and domains!
-    -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-    domain_seed = '963d9f9cad09649ad7ec0a32a4cd6a4cc9b66432160bdd39794c82c3f02eecca',
+  -- 32 byte random data in hexadecimal encoding
+  -- This data must be unique among all sites and domains!
+  -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
+  domain_seed = '963d9f9cad09649ad7ec0a32a4cd6a4cc9b66432160bdd39794c82c3f02eecca',
 
-    -- more domain specific config follows here
-    prefix4 = '10.99.0.0/18',
-	prefix6 = 'fd0a:d928:b30d:4::/64',
+  -- more domain specific config follows here
+  prefix4 = '10.99.0.0/18',
+  prefix6 = 'fd0a:d928:b30d:4::/64',
 
-    wifi24 = {
-		channel = 1,
-		ap = {
-			ssid = 'THW WLAN',
-		},
-		mesh = {
-			id = 'mesh.thw.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'THW WLAN',
-		},
-		mesh = {
-			id = 'mesh5.thw.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
+  wifi24 = {
+    channel = 1,
+    ap = {
+      ssid = 'THW WLAN',
+    },
+    mesh = {
+      id = 'mesh.thw.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
+  wifi5 = {
+    channel = 44,
+    ap = {
+      ssid = 'THW WLAN',
+    },
+    mesh = {
+      id = 'mesh5.thw.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
 
-	mesh = {
-   		vxlan = false,
-		batman_adv = {
-	        	gw_sel_class = 2500,
-			routing_algo = 'BATMAN_IV',
-		},
-  	},
+  mesh = {
+    vxlan = false,
+    batman_adv = {
+      gw_sel_class = 2500,
+      routing_algo = 'BATMAN_IV',
+    },
+  },
 
-	mesh_vpn = {
+  mesh_vpn = {
 
-		mtu = 1426,
+    mtu = 1426,
 
-		fastd = {
-			methods = {'null+salsa2012+umac'},
-			groups = {
-				backbone = {
-					limit = 1,
-					peers = {
-						vpn5 = {
-                            key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
-                            remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
-                        },
-					},
-				},
-			},
-		},
-	},
+    fastd = {
+      methods = {'null+salsa2012+umac'},
+      groups = {
+        backbone = {
+          limit = 1,
+          peers = {
+            vpn5 = {
+              key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
+              remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
+            },
+          },
+        },
+      },
+    },
+  },
 
-	next_node = {
-		ip4 = '10.99.0.1',
-		ip6 = 'fd0a:d928:b30d:4::1',
-		mac = 'ca:ff:ee:ba:be:01',
-	},
+  next_node = {
+    ip4 = '10.99.0.1',
+    ip6 = 'fd0a:d928:b30d:4::1',
+    mac = 'ca:ff:ee:ba:be:01',
+  },
 }
diff --git a/domains/ffwsee_v1.conf b/domains/ffwsee_v1.conf
index 95038be..30ec146 100644
--- a/domains/ffwsee_v1.conf
+++ b/domains/ffwsee_v1.conf
@@ -1,71 +1,70 @@
 {
-	domain_code = 'ffwsee_v1',
-    domain_names={
-        ffwsee_v1='Freifunk Weissensee',
-    }, 
-    
-    -- needed since v2018
-    -- 32 byte random data in hexadecimal encoding
-    -- This data must be unique among all sites and domains!
-    -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-	domain_seed = '394bf993cd0fbb63a9bc834207f36cc99df532c0e76d88bd6505642fcbe3ffcf',
+  domain_code = 'ffwsee_v1',
+  domain_names = {
+    ffwsee_v1 = 'Freifunk Weissensee',
+  },
 
-    -- more domain specific config follows here
-    prefix4 = '10.99.0.0/18',
-	prefix6 = 'fd0a:d928:b30d:4::/64',
+  -- 32 byte random data in hexadecimal encoding
+  -- This data must be unique among all sites and domains!
+  -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
+  domain_seed = '394bf993cd0fbb63a9bc834207f36cc99df532c0e76d88bd6505642fcbe3ffcf',
 
-    wifi24 = {
-		channel = 1,
-		ap = {
-			ssid = 'Freifunk Weissensee',
-		},
-		mesh = {
-			id = 'mesh.weissensee.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
-    wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'Freifunk Weissensee (5GHz)',
-		},
-		mesh = {
-			id = 'mesh.weissensee.freifunk.net',
-			mcast_rate = 12000,
-		},
-	},
+  -- more domain specific config follows here
+  prefix4 = '10.99.0.0/18',
+  prefix6 = 'fd0a:d928:b30d:4::/64',
 
-	mesh = {
-   		vxlan = false,
-		batman_adv = {
-	        	gw_sel_class = 2500,
-			routing_algo = 'BATMAN_IV',
-		},
-  	},
+  wifi24 = {
+    channel = 1,
+    ap = {
+      ssid = 'Freifunk Weissensee',
+    },
+    mesh = {
+      id = 'mesh.weissensee.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
+  wifi5 = {
+    channel = 44,
+    ap = {
+      ssid = 'Freifunk Weissensee (5GHz)',
+    },
+    mesh = {
+      id = 'mesh.weissensee.freifunk.net',
+      mcast_rate = 12000,
+    },
+  },
 
-	mesh_vpn = {
+  mesh = {
+    vxlan = false,
+    batman_adv = {
+      gw_sel_class = 2500,
+      routing_algo = 'BATMAN_IV',
+    },
+  },
 
-		mtu = 1426,
+  mesh_vpn = {
 
-		fastd = {
-			methods = {'null+salsa2012+umac'},
-			groups = {
-				backbone = {
-					limit = 1,
-					peers = {
-						vpn5 = {
-                            key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
-                            remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
-                        },
-					},
-				},
-			},
-		},
-	},
+    mtu = 1426,
 
-	next_node = {
-		ip4 = '10.99.0.1',
-		ip6 = 'fd0a:d928:b30d:4::1',
-		mac = 'ca:ff:ee:ba:be:01',
-	},
-}
\ No newline at end of file
+    fastd = {
+      methods = {'null+salsa2012+umac'},
+      groups = {
+        backbone = {
+          limit = 1,
+          peers = {
+            vpn5 = {
+              key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
+              remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
+            },
+          },
+        },
+      },
+    },
+  },
+
+  next_node = {
+    ip4 = '10.99.0.1',
+    ip6 = 'fd0a:d928:b30d:4::1',
+    mac = 'ca:ff:ee:ba:be:01',
+  },
+}
diff --git a/site.conf b/site.conf
index d16a6b6..f9db800 100644
--- a/site.conf
+++ b/site.conf
@@ -1,105 +1,104 @@
 {
-	default_domain = 'ffef_v1',
-	hostname_prefix = 'freifunk-',
-	site_name = 'Freifunk Erfurt',
-	site_code = 'ffef_v1',
+  default_domain = 'ffef_v1',
+  hostname_prefix = 'freifunk-',
+  site_name = 'Freifunk Erfurt',
+  site_code = 'ffef_v1',
 
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
-	ntp_servers = {
-		'ntp1.ffef',
-		'ntp2.ffef',
-		'2.de.pool.ntp.org',
-	},
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = {
+    'ntp1.ffef',
+    'ntp2.ffef',
+    '2.de.pool.ntp.org',
+  },
 
-	regdom = 'DE',
-	mesh_vpn = {
-		enabled = true,
-		bandwidth_limit = {
-			enabled = false,
-			egress = 1500,
-			ingress = 12000,
-		},
-	},
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://firmware.ffef/stable/sysupgrade',
-					'http://firmware.erfurt.freifunk.net/stable/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'bd7ba472ad1b230c4585d6da44655d113086b95d71094a40f275d3cb894347fb', -- mape2k
-					'65d4dc3a376d8514b74bba56fd77b72ed1a2fce3741053afcc3cfae306b67344', -- bt909
-					'6f54655d8f54c39c9ddf78432e1c45007cc81fd788137be38fb7f06ef2cc78d4', -- suicider
-					'd08c1cc38b201eda352cbc54127e39afacd34507bb5a56190128e2f7f03d9599', -- hipposen
-				}
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {
-					'http://firmware.ffef/beta/sysupgrade',
-					'http://firmware.erfurt.freifunk.net/beta/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'bd7ba472ad1b230c4585d6da44655d113086b95d71094a40f275d3cb894347fb', -- mape2k
-					'65d4dc3a376d8514b74bba56fd77b72ed1a2fce3741053afcc3cfae306b67344', -- bt909
-					'6f54655d8f54c39c9ddf78432e1c45007cc81fd788137be38fb7f06ef2cc78d4', -- suicider
-					'd08c1cc38b201eda352cbc54127e39afacd34507bb5a56190128e2f7f03d9599', -- hipposen
-				}
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {
-					'http://firmware.ffef/experimental/sysupgrade',
-					'http://firmware.erfurt.freifunk.net/experimental/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'bd7ba472ad1b230c4585d6da44655d113086b95d71094a40f275d3cb894347fb', -- mape2k
-					'65d4dc3a376d8514b74bba56fd77b72ed1a2fce3741053afcc3cfae306b67344', -- bt909
-					'6f54655d8f54c39c9ddf78432e1c45007cc81fd788137be38fb7f06ef2cc78d4', -- suicider
-					'd08c1cc38b201eda352cbc54127e39afacd34507bb5a56190128e2f7f03d9599', -- hipposen
-				}
-			},
-			nightly = {
-				name = 'nightly',
-				mirrors = {
-					'http://firmware.ffef/nightly/sysupgrade',
-					'http://firmware.erfurt.freifunk.net/nightly/sysupgrade',
-				},
-				good_signatures = 1,
-				pubkeys = {
-					'25caf7c8dc5fea30a212fc678c134f405aa52522b0e46b08f479bb3222b7a646', -- nightly
-				}
-			},
-		},
-	},
-	opkg = {
-		openwrt = 'http://opkgcache.ffef/lede/snapshots/packages/%A',
-		extra = {
+  regdom = 'DE',
+  mesh_vpn = {
+    enabled = true,
+    bandwidth_limit = {
+      enabled = false,
+      egress = 1500,
+      ingress = 12000,
+    },
+  },
+  autoupdater = {
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://firmware.ffef/stable/sysupgrade',
+          'http://firmware.erfurt.freifunk.net/stable/sysupgrade',
+        },
+        good_signatures = 2,
+        pubkeys = {
+          'bd7ba472ad1b230c4585d6da44655d113086b95d71094a40f275d3cb894347fb', -- mape2k
+          '65d4dc3a376d8514b74bba56fd77b72ed1a2fce3741053afcc3cfae306b67344', -- bt909
+          '6f54655d8f54c39c9ddf78432e1c45007cc81fd788137be38fb7f06ef2cc78d4', -- suicider
+          'd08c1cc38b201eda352cbc54127e39afacd34507bb5a56190128e2f7f03d9599', -- hipposen
+        }
+      },
+      beta = {
+        name = 'beta',
+        mirrors = {
+          'http://firmware.ffef/beta/sysupgrade',
+          'http://firmware.erfurt.freifunk.net/beta/sysupgrade',
+        },
+        good_signatures = 2,
+        pubkeys = {
+          'bd7ba472ad1b230c4585d6da44655d113086b95d71094a40f275d3cb894347fb', -- mape2k
+          '65d4dc3a376d8514b74bba56fd77b72ed1a2fce3741053afcc3cfae306b67344', -- bt909
+          '6f54655d8f54c39c9ddf78432e1c45007cc81fd788137be38fb7f06ef2cc78d4', -- suicider
+          'd08c1cc38b201eda352cbc54127e39afacd34507bb5a56190128e2f7f03d9599', -- hipposen
+        }
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://firmware.ffef/experimental/sysupgrade',
+          'http://firmware.erfurt.freifunk.net/experimental/sysupgrade',
+        },
+        good_signatures = 2,
+        pubkeys = {
+          'bd7ba472ad1b230c4585d6da44655d113086b95d71094a40f275d3cb894347fb', -- mape2k
+          '65d4dc3a376d8514b74bba56fd77b72ed1a2fce3741053afcc3cfae306b67344', -- bt909
+          '6f54655d8f54c39c9ddf78432e1c45007cc81fd788137be38fb7f06ef2cc78d4', -- suicider
+          'd08c1cc38b201eda352cbc54127e39afacd34507bb5a56190128e2f7f03d9599', -- hipposen
+        }
+      },
+      nightly = {
+        name = 'nightly',
+        mirrors = {
+          'http://firmware.ffef/nightly/sysupgrade',
+          'http://firmware.erfurt.freifunk.net/nightly/sysupgrade',
+        },
+        good_signatures = 1,
+        pubkeys = {
+          '25caf7c8dc5fea30a212fc678c134f405aa52522b0e46b08f479bb3222b7a646', -- nightly
+        }
+      },
+    },
+  },
+  opkg = {
+    openwrt = 'http://opkgcache.ffef/lede/snapshots/packages/%A',
+    extra = {
+      modules = 'http://firmware.ffef/stable/modules/%S',
+    },
+  },
+  roles = {
+    default = 'node',
+    list = {
+      'node',
+    },
+  },
 
-			modules = 'http://firmware.ffef/stable/modules/%S',
-		},
-	},
-	roles = {
-		default = 'node',
-		list = {
-			'node',
-		},
-	},
-
-	config_mode = {
-		hostname = {
-			optional = false,
-			prefill = true,
-		},
-	 remote_login = {
-	     show_password_form = true, -- default false
-	     min_password_length = 12
-	     },
-	}
+  config_mode = {
+    hostname = {
+      optional = false,
+      prefill = true,
+    },
+    remote_login = {
+      show_password_form = true, -- default false
+      min_password_length = 12
+    },
+  }
 }
diff --git a/site.mk b/site.mk
index 7eca774..497201f 100644
--- a/site.mk
+++ b/site.mk
@@ -42,7 +42,7 @@ GLUON_SITE_PACKAGES := \
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 
-DEFAULT_GLUON_RELEASE := 2021.1.2
+DEFAULT_GLUON_RELEASE := 2021.1.2.1
 
 # Variables set with ?= can be overwritten from the command line
 

From 16baa38be4f313c8d2d6ca9b880de226aea3491b Mon Sep 17 00:00:00 2001
From: Bob Idle <102661087+bobidle@users.noreply.github.com>
Date: Sun, 10 Mar 2024 20:16:28 +0100
Subject: [PATCH 2/4] ffil: switch wifi24 channel to 1

---
 domains/ffil_v1.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domains/ffil_v1.conf b/domains/ffil_v1.conf
index db5f6b7..a818675 100644
--- a/domains/ffil_v1.conf
+++ b/domains/ffil_v1.conf
@@ -14,7 +14,7 @@
   prefix6 = 'fd0a:d928:b30d:4::/64',
 
   wifi24 = {
-    channel = 6,
+    channel = 1,
     ap = {
       ssid = 'Freifunk Ilmenau',
     },

From 1917e6b568609b6fa698c9db7fe69cff45e5dca6 Mon Sep 17 00:00:00 2001
From: Bob Idle <102661087+bobidle@users.noreply.github.com>
Date: Sun, 10 Mar 2024 20:22:08 +0100
Subject: [PATCH 3/4] Add vpn6

---
 domains/ffef_v1.conf   | 4 ++++
 domains/ffen_v1.conf   | 4 ++++
 domains/ffgth_v1.conf  | 4 ++++
 domains/ffil_v1.conf   | 4 ++++
 domains/ffthw_v1.conf  | 4 ++++
 domains/ffwsee_v1.conf | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/domains/ffef_v1.conf b/domains/ffef_v1.conf
index cf77bb6..315800f 100644
--- a/domains/ffef_v1.conf
+++ b/domains/ffef_v1.conf
@@ -56,6 +56,10 @@
               key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
               remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
             },
+            vpn6 = {
+              key = '643209311edccd45058f470402faa0abf4020e36c0024f0b9c8b0740c97cd69c',
+              remotes = {'ipv4 "vpn6.erfurt.freifunk.net" port 1234'},
+            }
           },
         },
       },
diff --git a/domains/ffen_v1.conf b/domains/ffen_v1.conf
index e875af0..2f6ac39 100644
--- a/domains/ffen_v1.conf
+++ b/domains/ffen_v1.conf
@@ -56,6 +56,10 @@
               key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
               remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
             },
+            vpn6 = {
+              key = '643209311edccd45058f470402faa0abf4020e36c0024f0b9c8b0740c97cd69c',
+              remotes = {'ipv4 "vpn6.erfurt.freifunk.net" port 1234'},
+            }
           },
         },
       },
diff --git a/domains/ffgth_v1.conf b/domains/ffgth_v1.conf
index f1d33bd..ff63e20 100644
--- a/domains/ffgth_v1.conf
+++ b/domains/ffgth_v1.conf
@@ -56,6 +56,10 @@
               key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
               remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
             },
+            vpn6 = {
+              key = '643209311edccd45058f470402faa0abf4020e36c0024f0b9c8b0740c97cd69c',
+              remotes = {'ipv4 "vpn6.erfurt.freifunk.net" port 1234'},
+            }
           },
         },
       },
diff --git a/domains/ffil_v1.conf b/domains/ffil_v1.conf
index a818675..1997fd0 100644
--- a/domains/ffil_v1.conf
+++ b/domains/ffil_v1.conf
@@ -56,6 +56,10 @@
               key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
               remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
             },
+            vpn6 = {
+              key = '643209311edccd45058f470402faa0abf4020e36c0024f0b9c8b0740c97cd69c',
+              remotes = {'ipv4 "vpn6.erfurt.freifunk.net" port 1234'},
+            }
           },
         },
       },
diff --git a/domains/ffthw_v1.conf b/domains/ffthw_v1.conf
index 3213a20..d9d8267 100644
--- a/domains/ffthw_v1.conf
+++ b/domains/ffthw_v1.conf
@@ -56,6 +56,10 @@
               key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
               remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
             },
+            vpn6 = {
+              key = '643209311edccd45058f470402faa0abf4020e36c0024f0b9c8b0740c97cd69c',
+              remotes = {'ipv4 "vpn6.erfurt.freifunk.net" port 1234'},
+            }
           },
         },
       },
diff --git a/domains/ffwsee_v1.conf b/domains/ffwsee_v1.conf
index 30ec146..5f8b72b 100644
--- a/domains/ffwsee_v1.conf
+++ b/domains/ffwsee_v1.conf
@@ -56,6 +56,10 @@
               key = '880ca400d528a9a39c761a49fe1a54fa01a630a99b6217216bb126fecb4f50a1',
               remotes = {'ipv4 "vpn5.erfurt.freifunk.net" port 1234'},
             },
+            vpn6 = {
+              key = '643209311edccd45058f470402faa0abf4020e36c0024f0b9c8b0740c97cd69c',
+              remotes = {'ipv4 "vpn6.erfurt.freifunk.net" port 1234'},
+            }
           },
         },
       },

From 02fb743faa74a7e1eb17ca434f29db0780166fba Mon Sep 17 00:00:00 2001
From: Bob Idle <102661087+bobidle@users.noreply.github.com>
Date: Sun, 10 Mar 2024 20:33:33 +0100
Subject: [PATCH 4/4] Use unique domain seed for ffen, ffthw and ffwsee

---
 domains/ffen_v1.conf   | 2 +-
 domains/ffthw_v1.conf  | 2 +-
 domains/ffwsee_v1.conf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/domains/ffen_v1.conf b/domains/ffen_v1.conf
index 2f6ac39..e6b3a5f 100644
--- a/domains/ffen_v1.conf
+++ b/domains/ffen_v1.conf
@@ -7,7 +7,7 @@
   -- 32 byte random data in hexadecimal encoding
   -- This data must be unique among all sites and domains!
   -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-  domain_seed = '394bf993cd0fbb63a9bc834207f36cc99df532c0e76d88bd6505642fcbe3ffcf',
+  domain_seed = '9c0c83ec4e7037ff2c691856011eb9e0ee976a1f267a7393937f087782a7c70b',
 
   -- more domain specific config follows here
   prefix4 = '10.99.0.0/18',
diff --git a/domains/ffthw_v1.conf b/domains/ffthw_v1.conf
index d9d8267..e735030 100644
--- a/domains/ffthw_v1.conf
+++ b/domains/ffthw_v1.conf
@@ -7,7 +7,7 @@
   -- 32 byte random data in hexadecimal encoding
   -- This data must be unique among all sites and domains!
   -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-  domain_seed = '963d9f9cad09649ad7ec0a32a4cd6a4cc9b66432160bdd39794c82c3f02eecca',
+  domain_seed = 'd832e03641eab54fb1568e4a5a479ed8cb599ac6190b4e0a428f86b2cd553b11',
 
   -- more domain specific config follows here
   prefix4 = '10.99.0.0/18',
diff --git a/domains/ffwsee_v1.conf b/domains/ffwsee_v1.conf
index 5f8b72b..d5cd8cd 100644
--- a/domains/ffwsee_v1.conf
+++ b/domains/ffwsee_v1.conf
@@ -7,7 +7,7 @@
   -- 32 byte random data in hexadecimal encoding
   -- This data must be unique among all sites and domains!
   -- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
-  domain_seed = '394bf993cd0fbb63a9bc834207f36cc99df532c0e76d88bd6505642fcbe3ffcf',
+  domain_seed = '560420c93d1cd981a32433960d861cbad6ce2406bc88bba27399ce2ff6267bb7',
 
   -- more domain specific config follows here
   prefix4 = '10.99.0.0/18',