update to multi domain support within gluon (#1216 and #1250)

add domain generation script

.gitignore

@@ -1 +1 @@
-site.conf
+domains/

domain.tmpl

@@ -0,0 +1,118 @@
+{
+	-- name of this domain
+	domain_name = '%NA',
+
+	-- domain seed
+	domain_seed = '%SE',
+
+	-- hide this domain
+	hide_domain = %HI,
+
+	-- v4 and v6 prefixes in which nodes+clients might get an IP
+	prefix4 = '%V4',
+	prefix6 = '2a03:2260:2342:%V6::/64',
+
+	-- wifi settings (2.4 GHz and 5 GHz)
+	wifi24 = {
+		ap = {
+			ssid = '%SS',
+		},
+		mesh = {
+			id = 'ffho-mesh-%MI',
+		},
+	},
+
+	wifi5 = {
+		ap = {
+			ssid = '%SS',
+		},
+		mesh = {
+			id = 'ffho-mesh-%MI',
+		},
+	},
+
+	-- IP address of each router
+	-- At this IP a client can always connect to its
+	-- currently connected node. Both v4 and v6 addr.
+	-- must lie in the above prefix4 and prefix6.
+	next_node = {
+		ip4 = '%N4',
+		ip6 = '2a03:2260:2342:%V6::1',
+
+		-- mac address, must be unique in the client network
+		-- (usually, you don't need to change this)
+		mac = 'f2:ff:ff:%ID:ff:ff',
+	},
+
+	mesh_vpn = {
+		-- fastd (vpn) settings
+		fastd = {
+			groups = {
+				backbone = {
+					-- list all available vpn servers
+					peers = {
+						gw01 = {
+							-- remotes is an array of ways on how to reach the VPN server
+							-- Use public addresses here, these addresses are used when the mesh might not be connected yet.
+							-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
+							remotes = {
+								'"gw01.ffho.net" port 100%ID',
+								'ipv6 "2001:830:c:9::12" port 100%ID',
+								'ipv4 "80.242.130.70" port 100%ID',
+							},
+						},
+						gw02 = {
+							remotes = {
+								'"gw02.ffho.net" port 100%ID',
+								'ipv6 "2a01:4f8:190:6500::18:1" port 100%ID',
+								'ipv4 "78.46.242.24" port 100%ID',
+							},
+						},
+						gw03 = {
+							remotes = {
+								'"gw03.ffho.net" port 100%ID',
+								'ipv6 "2a00:13c8:1000:2::165" port 100%ID',
+								'ipv4 "185.46.137.165" port 100%ID',
+							},
+						},
+						gw04 = {
+							remotes = {
+								'"gw04.ffho.net" port 100%ID',
+								'ipv6 "2a02:450:1::22" port 100%ID',
+								'ipv4 "80.70.181.63" port 100%ID',
+							},
+						},
+						gw05 = {
+							remotes = {
+								'"gw05.ffho.net" port 100%ID',
+								'ipv6 "2001:638:502:1884::ff15" port 100%ID',
+								'ipv4 "192.26.175.183" port 100%ID',
+							},
+						},
+						gw06 = {
+							remotes = {
+								'"gw06.ffho.net" port 100%ID',
+							},
+						},
+					},
+				},
+			},
+		},
+	},
+
+	-- configure the autoupdater
+	autoupdater = {
+		-- available branches for the autoupdater
+		branches = {
+			stable = {
+				mirrors = {'http://firmware.srv.in.ffho.net/%CO/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%CO/stable/sysupgrade'},
+			},
+			testing = {
+				mirrors = {'http://firmware.srv.in.ffho.net/%CO/testing/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%CO/testing/sysupgrade'},
+			},
+			experimental = {
+				mirrors = {'http://firmware.srv.in.ffho.net/%CO/experimental/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%CO/experimental/sysupgrade'},
+			},
+		},
+	},
+}

extra/default.conf

@@ -1,11 +0,0 @@
-subst = {
-	['%%SN'] = 'Bitte wählen',
-	['%%SC'] = 'ffho',
-	['%%GN'] = 'uml',
-	['%%ID'] = '10',
-	['%%SS'] = 'hochstift.freifunk.net/default',
-	['%%V4'] = '10.132.112.0/21',
-	['%%V6'] = 'a00',
-	['%%N4'] = '10.132.112.1',
-	['%%SE'] = '1196057f9e89af883bd3b1d932cdd9bfa1fbcffecea290cd7b361ef3407caa40',
-}

extra/geo.json

@@ -1,2460 +0,0 @@
-{
-  "type": "FeatureCollection",
-  "features": [
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.8845,
-              51.69
-            ],
-            [
-              8.8765,
-              51.6925
-            ],
-            [
-              8.8815,
-              51.7105
-            ],
-            [
-              8.8755,
-              51.721
-            ],
-            [
-              8.902,
-              51.733
-            ],
-            [
-              8.8855,
-              51.746
-            ],
-            [
-              8.889,
-              51.758
-            ],
-            [
-              8.901,
-              51.797
-            ],
-            [
-              8.958,
-              51.7915
-            ],
-            [
-              8.982,
-              51.765
-            ],
-            [
-              8.982,
-              51.737
-            ],
-            [
-              8.9925,
-              51.711
-            ],
-            [
-              8.9725,
-              51.676
-            ],
-            [
-              8.9025,
-              51.701
-            ],
-            [
-              8.8845,
-              51.69
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_abn"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.985,
-              51.647
-            ],
-            [
-              8.9725,
-              51.676
-            ],
-            [
-              8.9925,
-              51.711
-            ],
-            [
-              8.982,
-              51.737
-            ],
-            [
-              8.982,
-              51.765
-            ],
-            [
-              8.958,
-              51.7915
-            ],
-            [
-              9.005,
-              51.7935
-            ],
-            [
-              9.0285,
-              51.7735
-            ],
-            [
-              9.0535,
-              51.779
-            ],
-            [
-              9.0415,
-              51.795
-            ],
-            [
-              9.078,
-              51.799
-            ],
-            [
-              9.0955,
-              51.756
-            ],
-            [
-              9.109,
-              51.757
-            ],
-            [
-              9.1015,
-              51.7385
-            ],
-            [
-              9.1095,
-              51.71
-            ],
-            [
-              9.065,
-              51.686
-            ],
-            [
-              9.104,
-              51.6745
-            ],
-            [
-              9.0865,
-              51.644
-            ],
-            [
-              9.07,
-              51.6485
-            ],
-            [
-              9.0675,
-              51.6585
-            ],
-            [
-              9.055,
-              51.661
-            ],
-            [
-              8.985,
-              51.647
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_bdr"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              9.384,
-              51.736
-            ],
-            [
-              9.3925,
-              51.7335
-            ],
-            [
-              9.402,
-              51.702
-            ],
-            [
-              9.3895,
-              51.671
-            ],
-            [
-              9.3745,
-              51.6495
-            ],
-            [
-              9.437,
-              51.649
-            ],
-            [
-              9.4445,
-              51.644
-            ],
-            [
-              9.428,
-              51.6295
-            ],
-            [
-              9.335,
-              51.6125
-            ],
-            [
-              9.2815,
-              51.6195
-            ],
-            [
-              9.283,
-              51.628
-            ],
-            [
-              9.2395,
-              51.6625
-            ],
-            [
-              9.2555,
-              51.669
-            ],
-            [
-              9.278,
-              51.678
-            ],
-            [
-              9.2945,
-              51.6985
-            ],
-            [
-              9.322,
-              51.704
-            ],
-            [
-              9.34,
-              51.723
-            ],
-            [
-              9.3495,
-              51.7205
-            ],
-            [
-              9.384,
-              51.736
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_bev"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              9.0865,
-              51.644
-            ],
-            [
-              9.104,
-              51.6745
-            ],
-            [
-              9.065,
-              51.686
-            ],
-            [
-              9.1095,
-              51.71
-            ],
-            [
-              9.1015,
-              51.7385
-            ],
-            [
-              9.109,
-              51.757
-            ],
-            [
-              9.1425,
-              51.761
-            ],
-            [
-              9.1685,
-              51.7835
-            ],
-            [
-              9.201,
-              51.796
-            ],
-            [
-              9.2575,
-              51.771
-            ],
-            [
-              9.2775,
-              51.745
-            ],
-            [
-              9.2645,
-              51.7015
-            ],
-            [
-              9.258,
-              51.6965
-            ],
-            [
-              9.2555,
-              51.669
-            ],
-            [
-              9.2395,
-              51.6625
-            ],
-            [
-              9.1955,
-              51.6285
-            ],
-            [
-              9.162,
-              51.644
-            ],
-            [
-              9.152,
-              51.634
-            ],
-            [
-              9.0865,
-              51.644
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_bkk"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.627,
-              51.482
-            ],
-            [
-              8.5385,
-              51.466
-            ],
-            [
-              8.505,
-              51.5305
-            ],
-            [
-              8.4875,
-              51.5295
-            ],
-            [
-              8.4745,
-              51.5735
-            ],
-            [
-              8.5135,
-              51.597
-            ],
-            [
-              8.534,
-              51.599
-            ],
-            [
-              8.58,
-              51.623
-            ],
-            [
-              8.625,
-              51.6325
-            ],
-            [
-              8.6905,
-              51.6055
-            ],
-            [
-              8.7055,
-              51.6095
-            ],
-            [
-              8.712,
-              51.5965
-            ],
-            [
-              8.6535,
-              51.557
-            ],
-            [
-              8.6545,
-              51.533
-            ],
-            [
-              8.6315,
-              51.5145
-            ],
-            [
-              8.627,
-              51.482
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_buq"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              9.335,
-              51.6125
-            ],
-            [
-              9.373,
-              51.5925
-            ],
-            [
-              9.321,
-              51.55
-            ],
-            [
-              9.308,
-              51.5125
-            ],
-            [
-              9.271,
-              51.5125
-            ],
-            [
-              9.2355,
-              51.5125
-            ],
-            [
-              9.233,
-              51.5195
-            ],
-            [
-              9.124,
-              51.552
-            ],
-            [
-              9.147,
-              51.5645
-            ],
-            [
-              9.204,
-              51.5615
-            ],
-            [
-              9.1955,
-              51.6285
-            ],
-            [
-              9.2395,
-              51.6625
-            ],
-            [
-              9.283,
-              51.628
-            ],
-            [
-              9.2815,
-              51.6195
-            ],
-            [
-              9.335,
-              51.6125
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_bxg"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.571,
-              51.8445
-            ],
-            [
-              8.5355,
-              51.8325
-            ],
-            [
-              8.529,
-              51.817
-            ],
-            [
-              8.468,
-              51.792
-            ],
-            [
-              8.4095,
-              51.754
-            ],
-            [
-              8.4025,
-              51.719
-            ],
-            [
-              8.4435,
-              51.7185
-            ],
-            [
-              8.4669,
-              51.723
-            ],
-            [
-              8.4895,
-              51.727
-            ],
-            [
-              8.5015,
-              51.709
-            ],
-            [
-              8.535,
-              51.716
-            ],
-            [
-              8.542,
-              51.708
-            ],
-            [
-              8.5505,
-              51.7105
-            ],
-            [
-              8.553,
-              51.709
-            ],
-            [
-              8.5515,
-              51.704
-            ],
-            [
-              8.5625,
-              51.7055
-            ],
-            [
-              8.5625,
-              51.7085
-            ],
-            [
-              8.5865,
-              51.725
-            ],
-            [
-              8.6435,
-              51.726
-            ],
-            [
-              8.6385,
-              51.7425
-            ],
-            [
-              8.64,
-              51.7555
-            ],
-            [
-              8.638,
-              51.773
-            ],
-            [
-              8.6815,
-              51.7905
-            ],
-            [
-              8.678,
-              51.7925
-            ],
-            [
-              8.6685,
-              51.798
-            ],
-            [
-              8.6605,
-              51.7955
-            ],
-            [
-              8.6455,
-              51.8085
-            ],
-            [
-              8.642,
-              51.8075
-            ],
-            [
-              8.6285,
-              51.818
-            ],
-            [
-              8.6175,
-              51.8185
-            ],
-            [
-              8.614,
-              51.8135
-            ],
-            [
-              8.5985,
-              51.8085
-            ],
-            [
-              8.597,
-              51.813
-            ],
-            [
-              8.5725,
-              51.8175
-            ],
-            [
-              8.575,
-              51.8255
-            ],
-            [
-              8.571,
-              51.8445
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_dek"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.4745,
-              51.5735
-            ],
-            [
-              8.4315,
-              51.598
-            ],
-            [
-              8.4135,
-              51.632
-            ],
-            [
-              8.4215,
-              51.6675
-            ],
-            [
-              8.4365,
-              51.6685
-            ],
-            [
-              8.444,
-              51.685
-            ],
-            [
-              8.459,
-              51.6885
-            ],
-            [
-              8.487,
-              51.6825
-            ],
-            [
-              8.51,
-              51.68
-            ],
-            [
-              8.5225,
-              51.6705
-            ],
-            [
-              8.553,
-              51.669
-            ],
-            [
-              8.574,
-              51.6545
-            ],
-            [
-              8.58,
-              51.623
-            ],
-            [
-              8.534,
-              51.599
-            ],
-            [
-              8.5135,
-              51.597
-            ],
-            [
-              8.4745,
-              51.5735
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_gee"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              9.4425,
-              51.844
-            ],
-            [
-              9.4445,
-              51.7935
-            ],
-            [
-              9.405,
-              51.761
-            ],
-            [
-              9.385,
-              51.7565
-            ],
-            [
-              9.384,
-              51.736
-            ],
-            [
-              9.3495,
-              51.7205
-            ],
-            [
-              9.34,
-              51.723
-            ],
-            [
-              9.322,
-              51.704
-            ],
-            [
-              9.2945,
-              51.6985
-            ],
-            [
-              9.278,
-              51.678
-            ],
-            [
-              9.2555,
-              51.669
-            ],
-            [
-              9.258,
-              51.6965
-            ],
-            [
-              9.2645,
-              51.7015
-            ],
-            [
-              9.2775,
-              51.745
-            ],
-            [
-              9.2575,
-              51.771
-            ],
-            [
-              9.303,
-              51.85
-            ],
-            [
-              9.461,
-              51.863
-            ],
-            [
-              9.4425,
-              51.844
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_hox"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.7485,
-              51.8685
-            ],
-            [
-              8.6875,
-              51.8565
-            ],
-            [
-              8.6625,
-              51.852
-            ],
-            [
-              8.654,
-              51.8665
-            ],
-            [
-              8.6375,
-              51.8795
-            ],
-            [
-              8.628,
-              51.863
-            ],
-            [
-              8.571,
-              51.8445
-            ],
-            [
-              8.575,
-              51.8255
-            ],
-            [
-              8.5725,
-              51.8175
-            ],
-            [
-              8.597,
-              51.813
-            ],
-            [
-              8.5985,
-              51.8085
-            ],
-            [
-              8.614,
-              51.8135
-            ],
-            [
-              8.6175,
-              51.8185
-            ],
-            [
-              8.6285,
-              51.818
-            ],
-            [
-              8.642,
-              51.8075
-            ],
-            [
-              8.6455,
-              51.8085
-            ],
-            [
-              8.6605,
-              51.7955
-            ],
-            [
-              8.6685,
-              51.798
-            ],
-            [
-              8.678,
-              51.7925
-            ],
-            [
-              8.699,
-              51.7975
-            ],
-            [
-              8.6985,
-              51.7985
-            ],
-            [
-              8.7455,
-              51.8015
-            ],
-            [
-              8.7485,
-              51.8685
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_hvf"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.4025,
-              51.719
-            ],
-            [
-              8.3205,
-              51.726
-            ],
-            [
-              8.309,
-              51.716
-            ],
-            [
-              8.2935,
-              51.686
-            ],
-            [
-              8.2955,
-              51.677
-            ],
-            [
-              8.2665,
-              51.664
-            ],
-            [
-              8.186,
-              51.662
-            ],
-            [
-              8.1865,
-              51.646
-            ],
-            [
-              8.211,
-              51.6425
-            ],
-            [
-              8.2115,
-              51.627
-            ],
-            [
-              8.225,
-              51.625
-            ],
-            [
-              8.2515,
-              51.643
-            ],
-            [
-              8.265,
-              51.6395
-            ],
-            [
-              8.3795,
-              51.6415
-            ],
-            [
-              8.392,
-              51.6265
-            ],
-            [
-              8.3945,
-              51.626
-            ],
-            [
-              8.3945,
-              51.6305
-            ],
-            [
-              8.4135,
-              51.632
-            ],
-            [
-              8.4215,
-              51.6675
-            ],
-            [
-              8.4365,
-              51.6685
-            ],
-            [
-              8.444,
-              51.685
-            ],
-            [
-              8.459,
-              51.6885
-            ],
-            [
-              8.487,
-              51.6825
-            ],
-            [
-              8.483,
-              51.693
-            ],
-            [
-              8.4685,
-              51.7045
-            ],
-            [
-              8.4765,
-              51.7075
-            ],
-            [
-              8.467,
-              51.723
-            ],
-            [
-              8.4435,
-              51.7185
-            ],
-            [
-              8.4025,
-              51.719
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_lip"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.8495,
-              51.5455
-            ],
-            [
-              8.788,
-              51.5665
-            ],
-            [
-              8.7375,
-              51.6075
-            ],
-            [
-              8.8455,
-              51.634
-            ],
-            [
-              8.8575,
-              51.6735
-            ],
-            [
-              8.8845,
-              51.69
-            ],
-            [
-              8.9025,
-              51.701
-            ],
-            [
-              8.9725,
-              51.676
-            ],
-            [
-              8.985,
-              51.647
-            ],
-            [
-              9.0145,
-              51.577
-            ],
-            [
-              8.9035,
-              51.527
-            ],
-            [
-              8.8585,
-              51.5485
-            ],
-            [
-              8.8495,
-              51.5455
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_lit"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              9.303,
-              51.85
-            ],
-            [
-              9.2715,
-              51.8655
-            ],
-            [
-              9.236,
-              51.8645
-            ],
-            [
-              9.218,
-              51.864
-            ],
-            [
-              9.2215,
-              51.852
-            ],
-            [
-              9.1885,
-              51.858
-            ],
-            [
-              9.1905,
-              51.844
-            ],
-            [
-              9.156,
-              51.8045
-            ],
-            [
-              9.1685,
-              51.7835
-            ],
-            [
-              9.201,
-              51.796
-            ],
-            [
-              9.2575,
-              51.771
-            ],
-            [
-              9.303,
-              51.85
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_mms"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.9035,
-              51.527
-            ],
-            [
-              8.9525,
-              51.503
-            ],
-            [
-              8.891,
-              51.482
-            ],
-            [
-              8.9235,
-              51.43
-            ],
-            [
-              8.9515,
-              51.43
-            ],
-            [
-              8.9405,
-              51.388
-            ],
-            [
-              8.8865,
-              51.3925
-            ],
-            [
-              8.8545,
-              51.377
-            ],
-            [
-              8.813,
-              51.3895
-            ],
-            [
-              8.7315,
-              51.372
-            ],
-            [
-              8.7,
-              51.375
-            ],
-            [
-              8.708,
-              51.4085
-            ],
-            [
-              8.7495,
-              51.4485
-            ],
-            [
-              8.8375,
-              51.4985
-            ],
-            [
-              8.8055,
-              51.531
-            ],
-            [
-              8.8495,
-              51.5455
-            ],
-            [
-              8.8585,
-              51.5485
-            ],
-            [
-              8.9035,
-              51.527
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_msg"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.713,
-              51.68
-            ],
-            [
-              8.7045,
-              51.705
-            ],
-            [
-              8.719,
-              51.7085
-            ],
-            [
-              8.725,
-              51.734
-            ],
-            [
-              8.739,
-              51.7475
-            ],
-            [
-              8.766,
-              51.759
-            ],
-            [
-              8.793,
-              51.74
-            ],
-            [
-              8.8185,
-              51.7155
-            ],
-            [
-              8.811,
-              51.696
-            ],
-            [
-              8.791,
-              51.68
-            ],
-            [
-              8.7835,
-              51.6845
-            ],
-            [
-              8.77,
-              51.6795
-            ],
-            [
-              8.745,
-              51.6815
-            ],
-            [
-              8.713,
-              51.68
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_pad_cty"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.713,
-              51.68
-            ],
-            [
-              8.661,
-              51.6605
-            ],
-            [
-              8.6555,
-              51.683
-            ],
-            [
-              8.67,
-              51.6995
-            ],
-            [
-              8.666,
-              51.7055
-            ],
-            [
-              8.659,
-              51.7095
-            ],
-            [
-              8.658,
-              51.714
-            ],
-            [
-              8.6435,
-              51.726
-            ],
-            [
-              8.6385,
-              51.7425
-            ],
-            [
-              8.64,
-              51.7555
-            ],
-            [
-              8.638,
-              51.773
-            ],
-            [
-              8.6815,
-              51.7905
-            ],
-            [
-              8.678,
-              51.7925
-            ],
-            [
-              8.699,
-              51.7975
-            ],
-            [
-              8.699,
-              51.7985
-            ],
-            [
-              8.7455,
-              51.8015
-            ],
-            [
-              8.7755,
-              51.771
-            ],
-            [
-              8.792,
-              51.773
-            ],
-            [
-              8.8185,
-              51.757
-            ],
-            [
-              8.889,
-              51.758
-            ],
-            [
-              8.8855,
-              51.746
-            ],
-            [
-              8.902,
-              51.733
-            ],
-            [
-              8.8755,
-              51.721
-            ],
-            [
-              8.8815,
-              51.7105
-            ],
-            [
-              8.8765,
-              51.6925
-            ],
-            [
-              8.8845,
-              51.69
-            ],
-            [
-              8.8575,
-              51.6735
-            ],
-            [
-              8.811,
-              51.696
-            ],
-            [
-              8.8185,
-              51.7155
-            ],
-            [
-              8.793,
-              51.74
-            ],
-            [
-              8.766,
-              51.759
-            ],
-            [
-              8.739,
-              51.7475
-            ],
-            [
-              8.725,
-              51.734
-            ],
-            [
-              8.719,
-              51.7085
-            ],
-            [
-              8.7045,
-              51.705
-            ],
-            [
-              8.713,
-              51.68
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_pad_uml"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.6645,
-              51.656
-            ],
-            [
-              8.661,
-              51.6605
-            ],
-            [
-              8.713,
-              51.68
-            ],
-            [
-              8.7455,
-              51.6815
-            ],
-            [
-              8.77,
-              51.6795
-            ],
-            [
-              8.7835,
-              51.6845
-            ],
-            [
-              8.791,
-              51.68
-            ],
-            [
-              8.811,
-              51.696
-            ],
-            [
-              8.8575,
-              51.6735
-            ],
-            [
-              8.8455,
-              51.634
-            ],
-            [
-              8.7375,
-              51.6075
-            ],
-            [
-              8.7275,
-              51.6155
-            ],
-            [
-              8.687,
-              51.648
-            ],
-            [
-              8.6645,
-              51.656
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_rhc"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.901,
-              51.797
-            ],
-            [
-              8.9125,
-              51.813
-            ],
-            [
-              8.895,
-              51.8045
-            ],
-            [
-              8.8615,
-              51.799
-            ],
-            [
-              8.803,
-              51.7985
-            ],
-            [
-              8.7455,
-              51.8015
-            ],
-            [
-              8.7755,
-              51.771
-            ],
-            [
-              8.792,
-              51.773
-            ],
-            [
-              8.8185,
-              51.757
-            ],
-            [
-              8.889,
-              51.758
-            ],
-            [
-              8.901,
-              51.797
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_rwb"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              9.0095,
-              51.7965
-            ],
-            [
-              9.005,
-              51.7935
-            ],
-            [
-              8.958,
-              51.7915
-            ],
-            [
-              8.9535,
-              51.835
-            ],
-            [
-              8.982,
-              51.8355
-            ],
-            [
-              9.0185,
-              51.8625
-            ],
-            [
-              9.0125,
-              51.877
-            ],
-            [
-              9.0265,
-              51.88
-            ],
-            [
-              9.039,
-              51.8735
-            ],
-            [
-              9.0545,
-              51.8735
-            ],
-            [
-              9.0915,
-              51.8895
-            ],
-            [
-              9.118,
-              51.898
-            ],
-            [
-              9.135,
-              51.8675
-            ],
-            [
-              9.1535,
-              51.8745
-            ],
-            [
-              9.1745,
-              51.8605
-            ],
-            [
-              9.144,
-              51.8345
-            ],
-            [
-              9.12,
-              51.849
-            ],
-            [
-              9.063,
-              51.8265
-            ],
-            [
-              9.0185,
-              51.823
-            ],
-            [
-              9.0015,
-              51.804
-            ],
-            [
-              9.0095,
-              51.7965
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_stm"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.467,
-              51.723
-            ],
-            [
-              8.4765,
-              51.7075
-            ],
-            [
-              8.4685,
-              51.7045
-            ],
-            [
-              8.483,
-              51.693
-            ],
-            [
-              8.487,
-              51.6825
-            ],
-            [
-              8.51,
-              51.68
-            ],
-            [
-              8.5225,
-              51.6705
-            ],
-            [
-              8.553,
-              51.669
-            ],
-            [
-              8.574,
-              51.6545
-            ],
-            [
-              8.58,
-              51.623
-            ],
-            [
-              8.625,
-              51.6325
-            ],
-            [
-              8.6905,
-              51.6055
-            ],
-            [
-              8.7055,
-              51.6095
-            ],
-            [
-              8.7275,
-              51.6155
-            ],
-            [
-              8.687,
-              51.648
-            ],
-            [
-              8.6645,
-              51.656
-            ],
-            [
-              8.661,
-              51.6605
-            ],
-            [
-              8.6555,
-              51.683
-            ],
-            [
-              8.67,
-              51.6995
-            ],
-            [
-              8.666,
-              51.7055
-            ],
-            [
-              8.659,
-              51.7095
-            ],
-            [
-              8.658,
-              51.714
-            ],
-            [
-              8.6435,
-              51.726
-            ],
-            [
-              8.5865,
-              51.725
-            ],
-            [
-              8.5625,
-              51.7085
-            ],
-            [
-              8.5625,
-              51.7055
-            ],
-            [
-              8.5515,
-              51.704
-            ],
-            [
-              8.553,
-              51.709
-            ],
-            [
-              8.5505,
-              51.7105
-            ],
-            [
-              8.542,
-              51.708
-            ],
-            [
-              8.535,
-              51.716
-            ],
-            [
-              8.5015,
-              51.709
-            ],
-            [
-              8.4895,
-              51.727
-            ],
-            [
-              8.467,
-              51.723
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_szn"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              9.271,
-              51.5125
-            ],
-            [
-              9.2635,
-              51.4985
-            ],
-            [
-              9.24,
-              51.4965
-            ],
-            [
-              9.217,
-              51.4815
-            ],
-            [
-              9.216,
-              51.4615
-            ],
-            [
-              9.18,
-              51.4665
-            ],
-            [
-              9.1555,
-              51.444
-            ],
-            [
-              9.0915,
-              51.446
-            ],
-            [
-              9.0795,
-              51.4645
-            ],
-            [
-              9.093,
-              51.4935
-            ],
-            [
-              9.078,
-              51.5025
-            ],
-            [
-              9.0215,
-              51.5155
-            ],
-            [
-              8.9525,
-              51.503
-            ],
-            [
-              8.9035,
-              51.527
-            ],
-            [
-              9.0145,
-              51.577
-            ],
-            [
-              9.0415,
-              51.5705
-            ],
-            [
-              9.0675,
-              51.5755
-            ],
-            [
-              9.0735,
-              51.5535
-            ],
-            [
-              9.1095,
-              51.539
-            ],
-            [
-              9.124,
-              51.552
-            ],
-            [
-              9.233,
-              51.5195
-            ],
-            [
-              9.2355,
-              51.5125
-            ],
-            [
-              9.271,
-              51.5125
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_wag"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.7495,
-              51.4485
-            ],
-            [
-              8.627,
-              51.482
-            ],
-            [
-              8.6315,
-              51.5145
-            ],
-            [
-              8.6545,
-              51.533
-            ],
-            [
-              8.6535,
-              51.557
-            ],
-            [
-              8.712,
-              51.5965
-            ],
-            [
-              8.7055,
-              51.6095
-            ],
-            [
-              8.7275,
-              51.6155
-            ],
-            [
-              8.7375,
-              51.6075
-            ],
-            [
-              8.788,
-              51.5665
-            ],
-            [
-              8.8495,
-              51.5455
-            ],
-            [
-              8.8055,
-              51.531
-            ],
-            [
-              8.8375,
-              51.4985
-            ],
-            [
-              8.7495,
-              51.4485
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_wux"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.9125,
-              51.813
-            ],
-            [
-              8.912,
-              51.8505
-            ],
-            [
-              8.882,
-              51.8605
-            ],
-            [
-              8.8165,
-              51.8825
-            ],
-            [
-              8.7485,
-              51.8685
-            ],
-            [
-              8.7455,
-              51.8015
-            ],
-            [
-              8.8035,
-              51.7985
-            ],
-            [
-              8.8615,
-              51.799
-            ],
-            [
-              8.895,
-              51.8045
-            ],
-            [
-              8.9125,
-              51.813
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_xsc"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              9.1885,
-              51.858
-            ],
-            [
-              9.1745,
-              51.8605
-            ],
-            [
-              9.144,
-              51.8345
-            ],
-            [
-              9.12,
-              51.849
-            ],
-            [
-              9.0625,
-              51.8265
-            ],
-            [
-              9.0185,
-              51.823
-            ],
-            [
-              9.0015,
-              51.804
-            ],
-            [
-              9.0095,
-              51.7965
-            ],
-            [
-              9.005,
-              51.7935
-            ],
-            [
-              9.0285,
-              51.7735
-            ],
-            [
-              9.0535,
-              51.779
-            ],
-            [
-              9.0415,
-              51.795
-            ],
-            [
-              9.078,
-              51.799
-            ],
-            [
-              9.0955,
-              51.756
-            ],
-            [
-              9.109,
-              51.757
-            ],
-            [
-              9.1425,
-              51.761
-            ],
-            [
-              9.1685,
-              51.7835
-            ],
-            [
-              9.156,
-              51.8045
-            ],
-            [
-              9.1905,
-              51.844
-            ],
-            [
-              9.1885,
-              51.858
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_yni"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              9.236,
-              51.8645
-            ],
-            [
-              9.2275,
-              51.894
-            ],
-            [
-              9.2085,
-              51.8955
-            ],
-            [
-              9.193,
-              51.9235
-            ],
-            [
-              9.1965,
-              51.943
-            ],
-            [
-              9.1755,
-              51.953
-            ],
-            [
-              9.126,
-              51.9425
-            ],
-            [
-              9.1145,
-              51.92
-            ],
-            [
-              9.117,
-              51.917
-            ],
-            [
-              9.086,
-              51.9105
-            ],
-            [
-              9.0915,
-              51.8895
-            ],
-            [
-              9.118,
-              51.898
-            ],
-            [
-              9.135,
-              51.8675
-            ],
-            [
-              9.1535,
-              51.8745
-            ],
-            [
-              9.1745,
-              51.8605
-            ],
-            [
-              9.1885,
-              51.858
-            ],
-            [
-              9.2215,
-              51.852
-            ],
-            [
-              9.218,
-              51.864
-            ],
-            [
-              9.236,
-              51.8645
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_yss"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              9.0145,
-              51.577
-            ],
-            [
-              8.985,
-              51.647
-            ],
-            [
-              9.055,
-              51.661
-            ],
-            [
-              9.0675,
-              51.6585
-            ],
-            [
-              9.07,
-              51.6485
-            ],
-            [
-              9.0865,
-              51.644
-            ],
-            [
-              9.152,
-              51.634
-            ],
-            [
-              9.162,
-              51.644
-            ],
-            [
-              9.1955,
-              51.6285
-            ],
-            [
-              9.204,
-              51.5615
-            ],
-            [
-              9.147,
-              51.5645
-            ],
-            [
-              9.124,
-              51.552
-            ],
-            [
-              9.1095,
-              51.539
-            ],
-            [
-              9.0735,
-              51.5535
-            ],
-            [
-              9.0675,
-              51.5755
-            ],
-            [
-              9.0415,
-              51.5705
-            ],
-            [
-              9.0145,
-              51.577
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_ywl"
-      }
-    },
-    {
-      "type": "Feature",
-      "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-          [
-            [
-              8.901,
-              51.797
-            ],
-            [
-              8.958,
-              51.7915
-            ],
-            [
-              8.9535,
-              51.835
-            ],
-            [
-              8.982,
-              51.8355
-            ],
-            [
-              9.0185,
-              51.8625
-            ],
-            [
-              9.0125,
-              51.877
-            ],
-            [
-              9.0265,
-              51.88
-            ],
-            [
-              9.039,
-              51.8735
-            ],
-            [
-              9.0545,
-              51.8735
-            ],
-            [
-              9.0915,
-              51.8895
-            ],
-            [
-              9.086,
-              51.9105
-            ],
-            [
-              9.0175,
-              51.9005
-            ],
-            [
-              9.003,
-              51.9255
-            ],
-            [
-              8.9855,
-              51.9255
-            ],
-            [
-              8.966,
-              51.914
-            ],
-            [
-              8.9485,
-              51.896
-            ],
-            [
-              8.931,
-              51.9025
-            ],
-            [
-              8.8965,
-              51.8935
-            ],
-            [
-              8.882,
-              51.8605
-            ],
-            [
-              8.912,
-              51.8505
-            ],
-            [
-              8.9125,
-              51.813
-            ],
-            [
-              8.901,
-              51.797
-            ]
-          ]
-        ]
-      },
-      "properties": {
-        "site_code": "ffho_zwg"
-      }
-    }
-  ]
-}

extra/groups.conf

@@ -1,4 +1,4 @@
-{
+groups = {
 	pad_cty = {
 		subst = {
 			['%%ID'] = '01',

extra/sites.conf

@@ -16,7 +16,18 @@
 --		group = 'pad_uml'
 --	},
 --},
-{
+sites = {
+	{
+		site_name = 'Bitte wählen',
+		site_code = 'ffho',
+		subst = {
+			['%%SS'] = 'hochstift.freifunk.net/default',
+		},
+		site_select = {
+			group = 'uml',
+			hidden = true,
+		},
+	},
 	{
 		site_name = 'Freifunk Hochstift - Altenbeken',
 		site_code = 'ffho_abn',
@@ -305,7 +316,7 @@
 			['%%SS'] = 'hochstift.freifunk.net/hamburg',
 		},
 		site_select = {
-			hidden = 1,
+			hidden = true,
 			group = 'uml',
 		},
 	},

gen-domains.lua

@@ -0,0 +1,31 @@
+#!/usr/bin/lua
+
+function replace_patterns(value, subst)
+  for k, v in pairs(subst) do
+    value = value:gsub(k, v)
+  end
+  return value
+end
+
+local site_dir = os.getenv('GLUON_SITEDIR')
+dofile(site_dir .. '/extra/sites.conf')
+dofile(site_dir .. '/extra/groups.conf')
+local template = io.open(site_dir .. '/domain.tmpl'):read('*a')
+os.execute('mkdir -p ' .. site_dir .. '/domains')
+
+for _, site in pairs(sites) do
+	local path = site_dir .. '/domains/' .. site.site_code .. '.conf'
+
+	local subst = {
+		['%%CO'] = site.site_code,
+		['%%NA'] = site.site_name,
+		['%%MI'] = site.site_select.group,
+		['%%HI'] = (site.site_select or {}).hidden and 'true' or 'false',
+	}
+
+	local config = replace_patterns(template, subst)
+	config = replace_patterns(config, site.subst)
+	config = replace_patterns(config, groups[site.site_select.group].subst)
+
+	io.open(path, 'w'):write(config)
+end

i18n/de.po

@@ -16,12 +16,15 @@ msgstr ""
 "Hochstift-Knoten. Fülle das folgende Formular deinen Vorstellungen "
 "entsprechend aus und sende es ab."
 
-msgid "gluon-config-mode:site-select"
+msgid "gluon-config-mode:domain-select"
 msgstr ""
 "Hier hast du die Möglichkeit, die Region, in der sich dein "
 "Knoten befindet, auszuwählen. Bitte denke daran, dass dein Router "
 "sich nur mit dem Netz der ausgewählten Region verbindet."
 
+msgid "gluon-config-mode:domain"
+msgstr "Region"
+
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 "<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem "

i18n/en.po

@@ -15,12 +15,15 @@ msgstr ""
 "Welcome the the setup wizard of your new Freifunk Hochstift node. "
 "Please fill out the following form and transmit it."
 
-msgid "gluon-config-mode:site-select"
+msgid "gluon-config-mode:domain-select"
 msgstr ""
 "Here you have the possibility of selecting the region in which "
 "your node is placed. Please keep in mind that your router "
 "connects only with the mesh of the selected region"
 
+msgid "gluon-config-mode:domain"
+msgstr "Region"
+
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 "<p>This is your Freifunk node's public key. The node won't be able to "

i18n/gluon-site.pot

@@ -4,7 +4,10 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
 msgid "gluon-config-mode:welcome"
 msgstr ""
 
-msgid "gluon-config-mode:site-select"
+msgid "gluon-config-mode:domain"
+msgstr ""
+
+msgid "gluon-config-mode:domain-select"
 msgstr ""
 
 msgid "gluon-config-mode:pubkey"

extra/template.conf → site.conf

@@ -5,18 +5,13 @@
 	hostname_prefix = 'freifunk',
 
 	-- name of this site
-	-- site_name = 'Freifunk Hochstift - ${site}',
-	site_name = '%SN',
+	site_name = 'Freifunk Hochstift',
 
 	-- short name of this site
-	-- site_code = 'ffho_${un-code}'
-	site_code = '%SC',
+	site_code = 'ffho',
 
-	site_seed = '%SE',
-
-	-- v4 and v6 prefixes in which nodes+clients might get an IP
-	prefix4 = '%V4',
-	prefix6 = '2a03:2260:2342:%V6::/64',
+	-- short name of default domain
+	default_domain_code = 'ffho',
 
 	-- timezone
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
@@ -36,44 +31,24 @@
 	regdom = 'DE',
 
 	-- wifi settings (2.4 GHz and 5 GHz)
-	-- ap.ssid = 'hochstift.freifunk.net/${kürzel}',
-	-- mesh.id = 'ffho-mesh-${group-name}',
 	wifi24 = {
 		channel = 1,
 		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
 		basic_rate = {6000, 9000, 18000, 36000, 54000},
-		ap = {
-			ssid = '%SS',
-		},
 		mesh = {
-			id = 'ffho-mesh-%GN',
 			mcast_rate = 12000,
 		},
 	},
 
 	wifi5 = {
 		channel = 44,
-		ap = {
-			ssid = '%SS',
-		},
 		mesh = {
-			id = 'ffho-mesh-%GN',
 			mcast_rate = 12000,
 		},
 	},
 
-	-- IP address of each router
-	-- At this IP a client can always connect to its
-	-- currently connected node. Both v4 and v6 addr.
-	-- must lie in the above prefix4 and prefix6.
 	next_node = {
-		ip4 = '%N4',
-		ip6 = '2a03:2260:2342:%V6::1',
 		name = 'node.ffho.net',
-
-		-- mac address, must be unique in the client network
-		-- (usually, you don't need to change this)
-		mac = 'f2:ff:ff:%ID:ff:ff',
 	},
 
 	mesh_vpn = {
@@ -94,54 +69,22 @@
 					-- list all available vpn servers
 					peers = {
 						gw01 = {
-							-- public fastd key of the vpn server
 							key = '97bc56ae561f67cfe15364134868c3553b5f1eab06f7bd9c5b93fbf280a52b51',
-							-- remotes is an array of ways on how to reach the VPN server
-							-- Use public addresses here, these addresses are used when the mesh might not be connected yet.
-							-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
-							remotes = {
-								'"gw01.ffho.net" port 100%ID',
-								'ipv6 "2001:830:c:9::12" port 100%ID',
-								'ipv4 "80.242.130.70" port 100%ID',
-							},
 						},
 						gw02 = {
 							key = 'e8fa9bf402fd33dd1ba804a97f2e46c704423ff49e9c55312845a7bfb93121ad',
-							remotes = {
-								'"gw02.ffho.net" port 100%ID',
-								'ipv6 "2a01:4f8:190:6500::18:1" port 100%ID',
-								'ipv4 "78.46.242.24" port 100%ID',
-							},
 						},
 						gw03 = {
 							key = '629b2742922f068ef49558283aea4b75c1427d8cdd3fcd2dbd7c00880547d3b3',
-							remotes = {
-								'"gw03.ffho.net" port 100%ID',
-								'ipv6 "2a00:13c8:1000:2::165" port 100%ID',
-								'ipv4 "185.46.137.165" port 100%ID',
-							},
 						},
 						gw04 = {
 							key = 'cf3855e5fa04e4c04a294cb6e8902f91c7ff7ef82bf031cc842a2b79b936677c',
-							remotes = {
-								'"gw04.ffho.net" port 100%ID',
-								'ipv6 "2a02:450:1::22" port 100%ID',
-								'ipv4 "80.70.181.63" port 100%ID',
-							},
 						},
 						gw05 = {
 							key = 'd0d32a2f536a0fc1f0c848e6da15bd96851d5ff4fdf9239c830bab033ddcec1a',
-							remotes = {
-								'"gw05.ffho.net" port 100%ID',
-								'ipv6 "2001:638:502:1884::ff15" port 100%ID',
-								'ipv4 "192.26.175.183" port 100%ID',
-							},
 						},
 						gw06 = {
 							key = '88b570c4cc811259b7c4106943098c9bee1126d692ddacedd23cd48efc28b0bf',
-							remotes = {
-								'"gw06.ffho.net" port 100%ID',
-							},
 						},
 					},
 				},
@@ -167,11 +110,6 @@
 				-- visible name of this branch (why not use the internal identifier here, too)
 				name = 'stable',
 
-				-- where to get the manifest file (without the trailing /manifest)
-				-- It's wise to use an internal address here,
-				-- but specifying a publicly available update site does not hurt.
-				mirrors = {'http://firmware.srv.in.ffho.net/%SC/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/stable/sysupgrade'},
-
 				-- Number of valid manifest signatures necessary to accept the manifest as "good".
 				good_signatures = 3,
 
@@ -186,7 +124,6 @@
 			},
 			testing = {
 				name = 'testing',
-				mirrors = {'http://firmware.srv.in.ffho.net/%SC/testing/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/testing/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
@@ -198,7 +135,6 @@
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://firmware.srv.in.ffho.net/%SC/experimental/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/experimental/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-

site.mk

@@ -8,10 +8,10 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-contact-info \
+	gluon-config-mode-domain-select \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-hostname \
 	gluon-config-mode-mesh-vpn \
-	ffho-config-mode-site-select \
 	ffho-debug \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \