Merge branch 'testing' into stable

.gitignore

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

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',
-	['%%DS'] = '6fdb7c99404fe91fca18e84bf48864681018741dc33fb6bde67d6041fc99210c',
-}

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,92 +1,73 @@
-{
-	pad_cty = {
-		subst = {
-			['%%ID'] = '01',
-			['%%V4'] = '10.132.32.0/20',
-			['%%V6'] = '100',
-			['%%N4'] = '10.132.32.1',
-			['%%DS'] = '346fe028635137fa012d2e7ef4c30c1998d988636d358c929559616e24f4f6bc',
-		},
+# -*- coding: utf-8 -*-
+groups = {
+	'pad_cty' : {
+		'%%ID' : '01',
+		'%%V4' : '10.132.32.0/20',
+		'%%V6' : '100',
+		'%%N4' : '10.132.32.1',
+		'%%DS' : '346fe028635137fa012d2e7ef4c30c1998d988636d358c929559616e24f4f6bc',
 	},
-	pad_uml = {
-		subst = {
-			['%%ID'] = '02',
-			['%%V4'] = '10.132.48.0/21',
-			['%%V6'] = '200',
-			['%%N4'] = '10.132.48.1',
-			['%%DS'] = '4d6ebfb6c5ac1507a7a9bd4b40c1e84f7f750db29a33ca721009f3d0e9b1569e',
-		},
+	'pad_uml' : {
+		'%%ID' : '02',
+		'%%V4' : '10.132.48.0/21',
+		'%%V6' : '200',
+		'%%N4' : '10.132.48.1',
+		'%%DS' : '4d6ebfb6c5ac1507a7a9bd4b40c1e84f7f750db29a33ca721009f3d0e9b1569e',
 	},
-	buq = {
-		subst = {
-			['%%ID'] = '03',
-			['%%V4'] = '10.132.56.0/21',
-			['%%V6'] = '300',
-			['%%N4'] = '10.132.56.1',
-			['%%DS'] = 'f57ae6294491f9b58cf2183dda44927a0b33f825156da68b05302dd8a0cc08b6',
-		},
+	'buq' : {
+		'%%ID' : '03',
+		'%%V4' : '10.132.56.0/21',
+		'%%V6' : '300',
+		'%%N4' : '10.132.56.1',
+		'%%DS' : 'f57ae6294491f9b58cf2183dda44927a0b33f825156da68b05302dd8a0cc08b6',
 	},
-	pb_nord = {
-		subst = {
-			['%%ID'] = '04',
-			['%%V4'] = '10.132.64.0/21',
-			['%%V6'] = '400',
-			['%%N4'] = '10.132.64.1',
-			['%%DS'] = '59452bf36c5614022c54fe9f5b4a0012da07a25d455b99079db0758b2fd748c8',
-		},
+	'pb_nord' : {
+		'%%ID' : '04',
+		'%%V4' : '10.132.64.0/21',
+		'%%V6' : '400',
+		'%%N4' : '10.132.64.1',
+		'%%DS' : '59452bf36c5614022c54fe9f5b4a0012da07a25d455b99079db0758b2fd748c8',
 	},
-	pb_ost = {
-		subst = {
-			['%%ID'] = '05',
-			['%%V4'] = '10.132.72.0/21',
-			['%%V6'] = '500',
-			['%%N4'] = '10.132.72.1',
-			['%%DS'] = 'ff018701d9378be833e6bcd2b38791f785cdeb41dcfa15255069d83a090f7a60',
-		},
+	'pb_ost' : {
+		'%%ID' : '05',
+		'%%V4' : '10.132.72.0/21',
+		'%%V6' : '500',
+		'%%N4' : '10.132.72.1',
+		'%%DS' : 'ff018701d9378be833e6bcd2b38791f785cdeb41dcfa15255069d83a090f7a60',
 	},
-	pb_sued = {
-		subst = {
-			['%%ID'] = '06',
-			['%%V4'] = '10.132.80.0/21',
-			['%%V6'] = '600',
-			['%%N4'] = '10.132.80.1',
-			['%%DS'] = '23598bf0196a7650428717c5ecd4cf6f3062271ed1020c86711176adffbcdc3b',
-		},
+	'pb_sued' : {
+		'%%ID' : '06',
+		'%%V4' : '10.132.80.0/21',
+		'%%V6' : '600',
+		'%%N4' : '10.132.80.1',
+		'%%DS' : '23598bf0196a7650428717c5ecd4cf6f3062271ed1020c86711176adffbcdc3b',
 	},
-	pb_west = {
-		subst = {
-			['%%ID'] = '07',
-			['%%V4'] = '10.132.88.0/21',
-			['%%V6'] = '700',
-			['%%N4'] = '10.132.88.1',
-			['%%DS'] = '1b8bed9940f072b2ad3ab51a97868c4f4346d73d7a7e41fee5954f0f67905e0c',
-		},
+	'pb_west' : {
+		'%%ID' : '07',
+		'%%V4' : '10.132.88.0/21',
+		'%%V6' : '700',
+		'%%N4' : '10.132.88.1',
+		'%%DS' : '1b8bed9940f072b2ad3ab51a97868c4f4346d73d7a7e41fee5954f0f67905e0c',
 	},
-	hx_nord = {
-		subst = {
-			['%%ID'] = '08',
-			['%%V4'] = '10.132.96.0/21',
-			['%%V6'] = '800',
-			['%%N4'] = '10.132.96.1',
-			['%%DS'] = 'a98d1fdc66bf8b952937183edf9d8a581ee375c09f30eb902deecea5d4036b1a',
-		},
+	'hx_nord' : {
+		'%%ID' : '08',
+		'%%V4' : '10.132.96.0/21',
+		'%%V6' : '800',
+		'%%N4' : '10.132.96.1',
+		'%%DS' : 'a98d1fdc66bf8b952937183edf9d8a581ee375c09f30eb902deecea5d4036b1a',
 	},
-	hx_sued = {
-		subst = {
-			['%%ID'] = '09',
-			['%%V4'] = '10.132.104.0/21',
-			['%%V6'] = '900',
-			['%%N4'] = '10.132.104.1',
-			['%%DS'] = '936f9b7ec3988901fc9f314958e923e9af7ac1f47234df27cc5fc5305ab973c0',
-		},
+	'hx_sued' : {
+		'%%ID' : '09',
+		'%%V4' : '10.132.104.0/21',
+		'%%V6' : '900',
+		'%%N4' : '10.132.104.1',
+		'%%DS' : '936f9b7ec3988901fc9f314958e923e9af7ac1f47234df27cc5fc5305ab973c0',
 	},
-	uml = {
-		subst = {
-			['%%ID'] = '10',
-			['%%V4'] = '10.132.112.0/21',
-			['%%V6'] = 'a00',
-			['%%N4'] = '10.132.112.1',
-			['%%DS'] = '47ab039f19c4865701a4d4f5123109ee4c340808b03d1261e596283206b2ebc2',
-		},
+	'uml' : {
+		'%%ID' : '10',
+		'%%V4' : '10.132.112.0/21',
+		'%%V6' : 'a00',
+		'%%N4' : '10.132.112.1',
+		'%%DS' : '47ab039f19c4865701a4d4f5123109ee4c340808b03d1261e596283206b2ebc2',
 	},
 }

extra/sites.conf

@@ -1,312 +1,197 @@
--- Define Blocks like:
--- ffho_pad = {
--- 	-- name of the region
--- 	site_name = 'Freifunk Hochstift - Paderborn (Umland)',
---
---	-- short name of the region
---	site_code = 'ffho_pad_uml',
---
---	subst = {
---		-- wifi settings
---		['%%SS'] = 'hochstift.freifunk.net/pad-umlnd',
---	},
---
---	site_select = {
---		hidden = 0,
---		group = 'pad_uml'
---	},
---},
-{
+# -*- coding: utf-8 -*-
+# Define Blocks like:
+# ffho_pad = {
+# 	-- name of the region
+# 	site_name = 'Freifunk Hochstift - Paderborn (Umland)',
+#
+#	-- short name of the region
+#	site_code = 'ffho_pad_uml',
+#
+#	subst = {
+#		-- wifi settings
+#		['%%SS'] = 'hochstift.freifunk.net/pad-umlnd',
+#	},
+#
+#	site_select = {
+#		hidden = 0,
+#		group = 'pad_uml'
+#	},
+#},
+sites = (
 	{
-		site_name = 'Freifunk Hochstift - Altenbeken',
-		site_code = 'ffho_abn',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/altenbkn',
-		},
-		site_select = {
-			group = 'pb_ost',
-		},
+		'site_name' : 'Freifunk Hochstift - Altenbeken',
+		'site_code' : 'ffho_abn',
+		'ssid' : 'hochstift.freifunk.net/altenbkn',
+		'group' : 'pb_ost',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Bad Driburg',
-		site_code = 'ffho_bdr',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/driburg',
-		},
-		site_select = {
-			group = 'hx_nord',
-		},
+		'site_name' : 'Freifunk Hochstift - Bad Driburg',
+		'site_code' : 'ffho_bdr',
+		'ssid' : 'hochstift.freifunk.net/driburg',
+		'group' : 'hx_nord',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Bad Lippspringe',
-		site_code = 'ffho_rwb',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/badlippsp',
-		},
-		site_select = {
-			group = 'pb_nord',
-		},
+		'site_name' : 'Freifunk Hochstift - Bad Lippspringe',
+		'site_code' : 'ffho_rwb',
+		'ssid' : 'hochstift.freifunk.net/badlippsp',
+		'group' : 'pb_nord',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Bad Wünnenberg',
-		site_code = 'ffho_wux',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/wuennenb',
-		},
-		site_select = {
-			group = 'pb_sued',
-		},
+		'site_name' : 'Freifunk Hochstift - Bad Wünnenberg',
+		'site_code' : 'ffho_wux',
+		'ssid' : 'hochstift.freifunk.net/wuennenb',
+		'group' : 'pb_sued',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Beverungen',
-		site_code = 'ffho_bev',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/beverungn',
-		},
-		site_select = {
-			group = 'hx_sued',
-		},
+		'site_name' : 'Freifunk Hochstift - Beverungen',
+		'site_code' : 'ffho_bev',
+		'ssid' : 'hochstift.freifunk.net/beverungn',
+		'group' : 'hx_sued',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Borchen',
-		site_code = 'ffho_rhc',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/borchen',
-		},
-		site_select = {
-			group = 'pb_sued',
-		},
+		'site_name' : 'Freifunk Hochstift - Borchen',
+		'site_code' : 'ffho_rhc',
+		'ssid' : 'hochstift.freifunk.net/borchen',
+		'group' : 'pb_sued',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Borgentreich',
-		site_code = 'ffho_bxg',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/borgentr',
-		},
-		site_select = {
-			group = 'hx_sued',
-		},
+		'site_name' : 'Freifunk Hochstift - Borgentreich',
+		'site_code' : 'ffho_bxg',
+		'ssid' : 'hochstift.freifunk.net/borgentr',
+		'group' : 'hx_sued',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Brakel',
-		site_code = 'ffho_bkk',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/brakel',
-		},
-		site_select = {
-			group = 'hx_nord',
-		},
+		'site_name' : 'Freifunk Hochstift - Brakel',
+		'site_code' : 'ffho_bkk',
+		'ssid' : 'hochstift.freifunk.net/brakel',
+		'group' : 'hx_nord',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Büren',
-		site_code = 'ffho_buq',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/bueren',
-		},
-		site_select = {
-			group = 'buq',
-		},
+		'site_name' : 'Freifunk Hochstift - Büren',
+		'site_code' : 'ffho_buq',
+		'ssid' : 'hochstift.freifunk.net/bueren',
+		'group' : 'buq',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Delbrück',
-		site_code = 'ffho_dek',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/delbrueck',
-		},
-		site_select = {
-			group = 'pb_west',
-		},
+		'site_name' : 'Freifunk Hochstift - Delbrück',
+		'site_code' : 'ffho_dek',
+		'ssid' : 'hochstift.freifunk.net/delbrueck',
+		'group' : 'pb_west',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Geseke',
-		site_code = 'ffho_gee',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/geseke',
-		},
-		site_select = {
-			group = 'uml',
-		},
+		'site_name' : 'Freifunk Hochstift - Geseke',
+		'site_code' : 'ffho_gee',
+		'ssid' : 'hochstift.freifunk.net/geseke',
+		'group' : 'uml',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Horn-Bad Meinberg',
-		site_code = 'ffho_zwg',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/horn',
-		},
-		site_select = {
-			group = 'uml',
-		},
+		'site_name' : 'Freifunk Hochstift - Horn-Bad Meinberg',
+		'site_code' : 'ffho_zwg',
+		'ssid' : 'hochstift.freifunk.net/horn',
+		'group' : 'uml',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Hövelhof',
-		site_code = 'ffho_hvf',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/hoevelhof',
-		},
-		site_select = {
-			group = 'pb_west',
-		},
+		'site_name' : 'Freifunk Hochstift - Hövelhof',
+		'site_code' : 'ffho_hvf',
+		'ssid' : 'hochstift.freifunk.net/hoevelhof',
+		'group' : 'pb_west',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Höxter',
-		site_code = 'ffho_hox',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/hoexter',
-		},
-		site_select = {
-			group = 'hx_nord',
-		},
+		'site_name' : 'Freifunk Hochstift - Höxter',
+		'site_code' : 'ffho_hox',
+		'ssid' : 'hochstift.freifunk.net/hoexter',
+		'group' : 'hx_nord',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Lichtenau',
-		site_code = 'ffho_lit',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/lichtenau',
-		},
-		site_select = {
-			group = 'pb_ost',
-		},
+		'site_name' : 'Freifunk Hochstift - Lichtenau',
+		'site_code' : 'ffho_lit',
+		'ssid' : 'hochstift.freifunk.net/lichtenau',
+		'group' : 'pb_ost',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Lippstadt',
-		site_code = 'ffho_lip',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/lippstadt',
-		},
-		site_select = {
-			group = 'uml',
-		},
+		'site_name' : 'Freifunk Hochstift - Lippstadt',
+		'site_code' : 'ffho_lip',
+		'ssid' : 'hochstift.freifunk.net/lippstadt',
+		'group' : 'uml',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Marienmünster',
-		site_code = 'ffho_mms',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/mms',
-		},
-		site_select = {
-			group = 'hx_nord',
-		},
+		'site_name' : 'Freifunk Hochstift - Marienmünster',
+		'site_code' : 'ffho_mms',
+		'ssid' : 'hochstift.freifunk.net/mms',
+		'group' : 'hx_nord',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Marsberg',
-		site_code = 'ffho_msg',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/marsberg',
-		},
-		site_select = {
-			group = 'uml',
-		},
+		'site_name' : 'Freifunk Hochstift - Marsberg',
+		'site_code' : 'ffho_msg',
+		'ssid' : 'hochstift.freifunk.net/marsberg',
+		'group' : 'uml',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Nieheim',
-		site_code = 'ffho_yni',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/nieheim',
-		},
-		site_select = {
-			group = 'hx_nord',
-		},
+		'site_name' : 'Freifunk Hochstift - Nieheim',
+		'site_code' : 'ffho_yni',
+		'ssid' : 'hochstift.freifunk.net/nieheim',
+		'group' : 'hx_nord',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Paderborn (Kernstadt)',
-		site_code = 'ffho_pad_cty',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/pad-city',
-		},
-		site_select = {
-			group = 'pad_cty',
-		},
+		'site_name' : 'Freifunk Hochstift - Paderborn (Kernstadt)',
+		'site_code' : 'ffho_pad_cty',
+		'ssid' : 'hochstift.freifunk.net/pad-city',
+		'group' : 'pad_cty',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Paderborn (Umland)',
-		site_code = 'ffho_pad_uml',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/pad-umlnd',
-		},
-		site_select = {
-			group = 'pad_uml',
-		},
+		'site_name' : 'Freifunk Hochstift - Paderborn (Umland)',
+		'site_code' : 'ffho_pad_uml',
+		'ssid' : 'hochstift.freifunk.net/pad-umlnd',
+		'group' : 'pad_uml',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Salzkotten',
-		site_code = 'ffho_szn',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/salzkottn',
-		},
-		site_select = {
-			group = 'pb_west',
-		},
+		'site_name' : 'Freifunk Hochstift - Salzkotten',
+		'site_code' : 'ffho_szn',
+		'ssid' : 'hochstift.freifunk.net/salzkottn',
+		'group' : 'pb_west',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Schieder-Schwalenberg',
-		site_code = 'ffho_yss',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/schieder',
-		},
-		site_select = {
-			group = 'uml',
-		},
+		'site_name' : 'Freifunk Hochstift - Schieder-Schwalenberg',
+		'site_code' : 'ffho_yss',
+		'ssid' : 'hochstift.freifunk.net/schieder',
+		'group' : 'uml',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Schlangen',
-		site_code = 'ffho_xsc',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/schlangen',
-		},
-		site_select = {
-			group = 'pb_nord',
-		},
+		'site_name' : 'Freifunk Hochstift - Schlangen',
+		'site_code' : 'ffho_xsc',
+		'ssid' : 'hochstift.freifunk.net/schlangen',
+		'group' : 'pb_nord',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Steinheim',
-		site_code = 'ffho_stm',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/steinheim',
-		},
-		site_select = {
-			group = 'hx_nord',
-		},
+		'site_name' : 'Freifunk Hochstift - Steinheim',
+		'site_code' : 'ffho_stm',
+		'ssid' : 'hochstift.freifunk.net/steinheim',
+		'group' : 'hx_nord',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Warburg',
-		site_code = 'ffho_wag',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/warburg',
-		},
-		site_select = {
-			group = 'hx_sued',
-		},
+		'site_name' : 'Freifunk Hochstift - Warburg',
+		'site_code' : 'ffho_wag',
+		'ssid' : 'hochstift.freifunk.net/warburg',
+		'group' : 'hx_sued',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Willebadessen',
-		site_code = 'ffho_ywl',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/willebdn',
-		},
-		site_select = {
-			group = 'hx_sued',
-		},
+		'site_name' : 'Freifunk Hochstift - Willebadessen',
+		'site_code' : 'ffho_ywl',
+		'ssid' : 'hochstift.freifunk.net/willebdn',
+		'group' : 'hx_sued',
 	},
 	{
-		site_name = 'Freifunk Hochstift - Umland',
-		site_code = 'ffho_yho',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/umland',
-		},
-		site_select = {
-			group = 'uml',
-		},
+		'site_name' : 'Freifunk Hochstift - Umland',
+		'site_code' : 'ffho_yho',
+		'ssid' : 'hochstift.freifunk.net/umland',
+		'group' : 'uml',
 	},
-	-- start hidden sites here --
+	# start hidden sites here 
 	{
-		site_name = 'Freifunk Hochstift - Hamburg',
-		site_code = 'ffho_ham',
-		subst = {
-			['%%SS'] = 'hochstift.freifunk.net/hamburg',
-		},
-		site_select = {
-			hidden = 1,
-			group = 'uml',
-		},
+		'site_name' : 'Freifunk Hochstift - Hamburg',
+		'site_code' : 'ffho_ham',
+		'ssid' : 'hochstift.freifunk.net/hamburg',
+		'hidden' : 'true',
+		'group' : 'uml',
 	},
-}
+)

extra/template.conf

@@ -1,16 +1,10 @@
 {
-	-- A new node's name will be autogenerated from
-	-- it's primary MAC address and this prefix.
-	-- e.g. freifunk-0123456789ab
-	hostname_prefix = 'freifunk',
-
-	-- name of this site
-	-- site_name = 'Freifunk Hochstift - ${site}',
-	site_name = '%SN',
+	domain_names = {
+		%SC = '%SN',
+	},
 
-	-- short name of this site
-	-- site_code = 'ffho_${un-code}'
-	site_code = '%SC',
+	-- hide domain
+	hide_domain = %HIDE,
 
 	-- 32 bytes of random data, encoded in hexadecimal, used to seed other 
 	-- random values specific to the mesh domain. It must be the same for all 
@@ -23,12 +17,6 @@
 	prefix4 = '%V4',
 	prefix6 = '2a03:2260:2342:%V6::/64',
 
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-
-	-- network-internal ntp service
-	ntp_servers = {'ntp.srv.in.ffho.net'},
-
 	-- OpenWRT Package Repository (IPv6 capable)
 	opkg = {
 		openwrt = 'http://firmware.srv.in.ffho.net/openwrt/packages-%v/%A',
@@ -37,9 +25,6 @@
 		},
 	},
 
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
 	mesh = {
 		-- for now, we don't use vxlan on the mesh
 		vxlan = false,
@@ -58,7 +43,6 @@
 		},
 		mesh = {
 			id = 'ffho-mesh-%GN',
-			mcast_rate = 12000,
 		},
 	},
 
@@ -69,7 +53,6 @@
 		},
 		mesh = {
 			id = 'ffho-mesh-%GN',
-			mcast_rate = 12000,
 		},
 	},
 
@@ -88,14 +71,8 @@
 	},
 
 	mesh_vpn = {
-		-- the maximum transfer unit
-		mtu = 1406,
-
 		-- fastd (vpn) settings
 		fastd = {
-			-- cipher(s) to use
-			methods = {'salsa2012+umac'},
-
 			groups = {
 				backbone = {
 					-- specifies how many servers are contacted
@@ -112,16 +89,16 @@
 							-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
 							remotes = {
 								'"gw01.ffho.net" port 100%ID',
-								'ipv6 "2001:638:502:1884::ff15" port 100%ID',
-								'ipv4 "192.26.175.183" port 100%ID',
+								'ipv6 "2001:638:502:1884::185" port 100%ID',
+								'ipv4 "192.26.175.185" 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',
+								'ipv6 "2a03:fc0:1006:1500::211" port 100%ID',
+								'ipv4 "156.67.189.211" port 100%ID',
 							},
 						},
 						gw03 = {
@@ -161,86 +138,6 @@
 			},
 		},
 
-		-- default traffic shaping (bandwidth limit) settings
-		bandwidth_limit = {
-			enabled = false,
-			egress = 500,
-			ingress = 4000,
-		},
-	},
-
-	-- configure the autoupdater
-	autoupdater = {
-		-- default branch for a firmware without enabled autoupdater
-		branch = 'stable',
-
-		-- available branches for the autoupdater
-		branches = {
-			stable = {
-				-- 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/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/stable/sysupgrade', 'http://firmware.ffho.net/stable/sysupgrade'},
-
-				-- Number of valid manifest signatures necessary to accept the manifest as "good".
-				good_signatures = 3,
-
-				-- list of public keys which are considered "good" for manifest signatures
-				pubkeys = {
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
-				},
-			},
-			testing = {
-				name = 'testing',
-				mirrors = {'http://firmware.srv.in.ffho.net/testing/sysupgrade', 'http://[2a03:2260:2342:f251::6]/testing/sysupgrade', 'http://firmware.ffho.net/testing/sysupgrade'},
-				good_signatures = 2,
-				pubkeys = {
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://firmware.srv.in.ffho.net/experimental/sysupgrade', 'http://[2a03:2260:2342:f251::6]/experimental/sysupgrade', 'http://firmware.ffho.net/experimental/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
-				},
-			},
-		},
-	},
-
-	config_mode = {
-		-- Show/hide the altitude field
-		geo_location = {
-			show_altitude = false,
-			osm = {
-				center = {
-					lat = 51.695543946,
-					lon = 8.958663940,
-				},
-				zoom = 11,
-			},
-		},
-		-- define if the contact field is obligatory (optional)
-		owner = {
-			obligatory = false,
-		},
 	},
 
-	-- configure DNS forwarding
-	dns = {
-		servers = { '2a03:2260:2342:f251::53' },
-	},
 }

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 ""
 

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 ""
 

modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=https://git.ffho.net/freifunkhochstift/ffho-packages.git
 PACKAGES_FFHO_BRANCH=master
-PACKAGES_FFHO_COMMIT=cf2dc9b8d512fcfc6148805b1766b398ca2c4183
+PACKAGES_FFHO_COMMIT=14a8489c0d844c7aba48fbdc9a72819242986454

scripts/gensites.py

@@ -0,0 +1,41 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+import os,sys
+
+if not 'GLUON_SITEDIR' in os.environ:
+    print "GLUON_SITEDIR not set"
+    sys.exit(1)
+
+execfile(os.environ['GLUON_SITEDIR'] + "/extra/sites.conf")
+execfile(os.environ['GLUON_SITEDIR'] + "/extra/groups.conf")
+DOMAINS=os.environ['GLUON_SITEDIR'] + "/domains/"
+TEMPLATE = ""
+with open(os.environ['GLUON_SITEDIR'] + "/extra/template.conf") as f:
+    TEMPLATE = f.readlines()
+
+if not os.path.isdir(os.environ['GLUON_SITEDIR'] + "/domains"):
+    try:
+        os.mkdir(os.environ['GLUON_SITEDIR'] + "/domains")
+    except OSError:
+        print ("Creation of the directory %s failed" % os.environ['GLUON_SITEDIR'] + "/domains")
+
+# generate domain specific site confs
+for s in sites:
+    with open(DOMAINS + s['site_code'] + ".conf", "w") as f:
+        for line in TEMPLATE:
+            # Substitute values
+            line = line.replace('%SN', s['site_name'])
+            line = line.replace('%SC', s['site_code'])
+            line = line.replace('%SS', s['ssid'])
+            line = line.replace('%DS', groups[s['group']]['%%DS'])
+            line = line.replace('%V4', groups[s['group']]['%%V4'])
+            line = line.replace('%V6', groups[s['group']]['%%V6'])
+            line = line.replace('%N4', groups[s['group']]['%%N4'])
+            line = line.replace('%ID', groups[s['group']]['%%ID'])
+            line = line.replace('%GN', s['group'])
+            if 'hide' in s:
+                line = line.replace('%HIDE', s['hide'])
+            else:
+                line = line.replace('%HIDE', 'false')
+            f.write(line)

site.conf

@@ -0,0 +1,133 @@
+{
+	-- A new node's name will be autogenerated from
+	-- it's primary MAC address and this prefix.
+	-- e.g. freifunk-0123456789ab
+	hostname_prefix = 'freifunk',
+
+	-- name of this site
+	-- site_name = 'Freifunk Hochstift - ${site}',
+	site_name = 'Freifunk Hochstift',
+
+	-- short name of this site
+	-- site_code = 'ffho_${un-code}'
+	site_code = 'ffho',
+
+	default_domain = 'ffho_yho',
+
+	-- timezone
+	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
+
+	-- network-internal ntp service
+	ntp_servers = {'ntp.srv.in.ffho.net'},
+
+	-- regulatory domain of your wifi
+	regdom = 'DE',
+
+	-- wifi settings (2.4 GHz and 5 GHz)
+	-- ap.ssid = 'hochstift.freifunk.net/${kürzel}',
+	-- mesh.id = 'ffho-mesh-${group-name}',
+	wifi24 = {
+		mesh = {
+			mcast_rate = 12000,
+		},
+	},
+
+	wifi5 = {
+		mesh = {
+			mcast_rate = 12000,
+		},
+	},
+
+	mesh_vpn = {
+		-- the maximum transfer unit
+		mtu = 1406,
+
+		-- fastd (vpn) settings
+		fastd = {
+			-- cipher(s) to use
+			methods = {'salsa2012+umac'},
+		},
+
+		-- default traffic shaping (bandwidth limit) settings
+		bandwidth_limit = {
+			enabled = false,
+			egress = 500,
+			ingress = 4000,
+		},
+	},
+
+	-- configure the autoupdater
+	autoupdater = {
+		-- default branch for a firmware without enabled autoupdater
+		branch = 'stable',
+
+		-- available branches for the autoupdater
+		branches = {
+			stable = {
+				-- 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/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/stable/sysupgrade', 'http://firmware.ffho.net/stable/sysupgrade'},
+
+				-- Number of valid manifest signatures necessary to accept the manifest as "good".
+				good_signatures = 3,
+
+				-- list of public keys which are considered "good" for manifest signatures
+				pubkeys = {
+					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
+					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
+					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
+					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
+				},
+			},
+			testing = {
+				name = 'testing',
+				mirrors = {'http://firmware.srv.in.ffho.net/testing/sysupgrade', 'http://[2a03:2260:2342:f251::6]/testing/sysupgrade', 'http://firmware.ffho.net/testing/sysupgrade'},
+				good_signatures = 2,
+				pubkeys = {
+					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
+					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
+					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
+					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
+				},
+			},
+			experimental = {
+				name = 'experimental',
+				mirrors = {'http://firmware.srv.in.ffho.net/experimental/sysupgrade', 'http://[2a03:2260:2342:f251::6]/experimental/sysupgrade', 'http://firmware.ffho.net/experimental/sysupgrade'},
+				good_signatures = 1,
+				pubkeys = {
+					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
+					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
+					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
+					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
+				},
+			},
+		},
+	},
+
+	config_mode = {
+		-- Show/hide the altitude field
+		geo_location = {
+			show_altitude = false,
+			osm = {
+				center = {
+					lat = 51.695543946,
+					lon = 8.958663940,
+				},
+				zoom = 11,
+			},
+		},
+		-- define if the contact field is obligatory (optional)
+		owner = {
+			obligatory = false,
+		},
+	},
+
+	-- configure DNS forwarding
+	dns = {
+		servers = { '2a03:2260:2342:f251::53' },
+	},
+}

site.mk

@@ -4,6 +4,7 @@ GLUON_FEATURES := \
         ebtables-filter-ra-dhcp \
         ebtables-limit-arp \
 	config-mode-geo-location-osm \
+	config-mode-domain-select \
         mesh-batman-adv-15 \
         mesh-vpn-fastd \
         respondd \
@@ -16,9 +17,9 @@ GLUON_SITE_PACKAGES := \
 	ffho-ap-timer \
 	ffho-autoupdater-wifi-fallback \
 	ffho-banner \
-	ffho-config-mode-site-select \
 	ffho-web-ap-timer \
 	ffho-web-autoupdater \
+	ffho-domain-migration \
 	iwinfo \
 	haveged
 
@@ -34,9 +35,7 @@ USB_NIC := \
 	kmod-usb-net-rtl8152 \
 	kmod-usb-net-dm9601-ether
 
-WLAN := \
-	kmod-ath9k \
-	kmod-ath10k-ct \
+WLAN := kmod-ath9k
 
 ifeq ($(GLUON_TARGET),x86-generic)
 	GLUON_SITE_PACKAGES += \
@@ -54,7 +53,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.3.0~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.4.0~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
@@ -63,3 +62,4 @@ GLUON_REGION ?= eu
 GLUON_LANGS ?= en de
 GLUON_ATH10K_MESH ?= 11s
 GLUON_DEPRECATED ?= full
+GLUON_MULTIDOMAIN=1