Merge branch 'testing' into stable

extra/geo.json

@@ -0,0 +1,2460 @@
+{
+  "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"
+      }
+    }
+  ]
+}

i18n/de.po

@@ -31,6 +31,12 @@ msgstr ""
 "an <a href=\"mailto:kontakt@hochstift.freifunk.net\">kontakt@hochstift.freifunk.net</a> oder benutze am besten gleich das "
 "<a href=\"http://hochstift.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>&email=<%=contact%>\"> "
 "vorausgefüllte Formular auf unserer Webseite</a>.<br><br>"
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

i18n/en.po

@@ -30,6 +30,12 @@ msgstr ""
 "<a href=\"http://hochstift.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>&email=<%=contact%>\">this form</a> "
 "or send it together with your node's name (<em><%=hostname%></em>) to "
 "<a href=\"mailto:kontakt@hochstift.freifunk.net\">kontakt@hochstift.freifunk.net</a>."
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

modules

@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffho-packages.git
-PACKAGES_FFHO_BRANCH=v2015.1.x
-PACKAGES_FFHO_COMMIT=94fe25943b03aaaf6f92a1ed11eda80031d1e57f
+PACKAGES_FFHO_BRANCH=v2016.1.x
+PACKAGES_FFHO_COMMIT=e423146cfa252da40d10bf18ce64c210cbc751c0

patches/0001-add-support-for-futro.patch

@@ -1,85 +0,0 @@
-From 7c749b9250367d6eb4c1d0b978cecc13c1a5e919 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Karsten=20B=C3=B6ddeker?= <freifunk@kb-light.de>
-Date: Thu, 15 Oct 2015 16:35:06 +0200
-Subject: [PATCH] add support for futro
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Karsten Böddeker <freifunk@kb-light.de>
----
- patches/openwrt/1000-Add-support-for-futro.patch | 50 ++++++++++++++++++++++++
- targets/x86-generic/profiles.mk                  |  4 +-
- 2 files changed, 53 insertions(+), 1 deletion(-)
- create mode 100644 patches/openwrt/1000-Add-support-for-futro.patch
-
-diff --git a/patches/openwrt/1000-Add-support-for-futro.patch b/patches/openwrt/1000-Add-support-for-futro.patch
-new file mode 100644
-index 0000000..9efa901
---- /dev/null
-+++ b/patches/openwrt/1000-Add-support-for-futro.patch
-@@ -0,0 +1,50 @@
-+From: Karsten Böddeker <freifunk@kb-light.de>
-+Date: Thu, 15 Oct 2015 14:40:53 +0200
-+Subject: Add support for futro
-+
-+diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
-+index 96c899a..0c531ca 100644
-+--- a/package/kernel/linux/modules/usb.mk
-++++ b/package/kernel/linux/modules/usb.mk
-+@@ -1439,3 +1439,32 @@ define KernelPackage/usb3/description
-+ endef
-+
-+ $(eval $(call KernelPackage,usb3))
-++
-++define KernelPackage/usb-net-rtl8150
-++  TITLE:=Kernel module for USB-to-Ethernet Realtek convertors
-++  KCONFIG:=CONFIG_USB_RTL8150
-++  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/rtl8150.ko
-++  AUTOLOAD:=$(call AutoProbe,rtl8150)
-++  $(call AddDepends/usb-net)
-++endef
-++
-++define KernelPackage/usb-net-rtl8150/description
-++ Kernel module for USB-to-Ethernet Realtek 8150 convertors
-++endef
-++
-++$(eval $(call KernelPackage,usb-net-rtl8150))
-++
-++
-++define KernelPackage/usb-net-rtl8152
-++  TITLE:=Kernel module for USB-to-Ethernet Realtek convertors
-++  KCONFIG:=CONFIG_USB_RTL8152
-++  FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/r8152.ko
-++  AUTOLOAD:=$(call AutoProbe,r8152)
-++  $(call AddDepends/usb-net)
-++endef
-++
-++define KernelPackage/usb-net-rtl8152/description
-++ Kernel module for USB-to-Ethernet Realtek 8152 USB2.0/3.0 convertors
-++endef
-++
-++$(eval $(call KernelPackage,usb-net-rtl8152))
-+diff --git a/target/linux/x86/generic/config-3.10 b/target/linux/x86/generic/config-3.10
-+index 2babaab..12d1c7f 100644
-+--- a/target/linux/x86/generic/config-3.10
-++++ b/target/linux/x86/generic/config-3.10
-+@@ -201,3 +201,4 @@ CONFIG_VT_CONSOLE=y
-+ CONFIG_X86_PM_TIMER=y
-+ # CONFIG_XO15_EBOOK is not set
-+ # CONFIG_ZISOFS is not set
-++CONFIG_PATA_ATIIXP=y
-diff --git a/targets/x86-generic/profiles.mk b/targets/x86-generic/profiles.mk
-index b6551a7..a8a068d 100644
---- a/targets/x86-generic/profiles.mk
-+++ b/targets/x86-generic/profiles.mk
-@@ -1,4 +1,6 @@
--X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity
-+X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-e100 kmod-e1000 kmod-e1000e kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity \
-+       kmod-usb-core kmod-usb2 kmod-usb-hid kmod-usb-net kmod-usb-net-asix kmod-usb-net-rtl8150 kmod-usb-net-rtl8152
-+
-
-
- $(eval $(call GluonProfile,GENERIC,$(X86_GENERIC_NETWORK_MODULES)))
---
-2.1.4

site.conf

@@ -17,10 +17,7 @@
 	prefix6 = 'fdca:ffee:ff12:132::/64',
 
 	-- extra ipv6 prefixes used in this mesh area
-	additional_prefix6 = {
-		'2001:470:6d:860::/64',
-		'2a03:2260:2342:2300::/64',
-	},
+	additional_prefix6 = { '2001:470:6d:860::/64', '2a03:2260:2342:2300::/64', },
 
 	-- timezone
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
@@ -29,30 +26,45 @@
 	ntp_servers = {'ntp.in.ffho.net'},
 
 	-- OpenWRT Package Repository (IPv6 capable)
-	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/barrier_breaker/14.07/%S/packages/',
+	opkg = {
+		openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+		extra = {
+			modules = 'http://firmware.ffho.net/modules/gluon-ffho-%GR/%S',
+		},
+	},
 
 	-- regulatory domain of your wifi
-	regdom = 'DE',
+	regdom = '00',
 
 	-- wifi settings (2.4 GHz and 5 GHz)
-	-- ssid = 'hochstift.freifunk.net/${kürzel}',
-	-- mesh_ssid = 'ffho-mesh-${un-code}',
-	-- mesh_bssid = '${idividual-mac}'
+	-- ap.ssid = 'hochstift.freifunk.net/${kürzel}',
+	-- ibss.ssid = 'ffho-mesh-${un-code}',
+	-- ibss.bssid = '${idividual-mac}'
 	wifi24 = {
-		ssid = 'paderborn.freifunk.net',
 		channel = 1,
-		htmode = 'HT20',
-		mesh_ssid = '02:d1:11:13:87:ad',
-		mesh_bssid = '02:d1:11:13:87:ad',
-		mesh_mcast_rate = 12000,
+
+		ap = {
+			ssid = 'paderborn.freifunk.net',
+		},
+
+		ibss = {
+			ssid = '02:d1:11:13:87:ad',
+			bssid = '02:d1:11:13:87:ad',
+			mesh_mcast_rate = 12000,
+		},
 	},
 	wifi5 = {
-		ssid = 'paderborn.freifunk.net',
 		channel = 44,
-		htmode = 'HT40+',
-		mesh_ssid = '02:d1:11:13:87:ad',
-		mesh_bssid = '02:d1:11:13:87:ad',
-		mesh_mcast_rate = 12000,
+
+		ap = {
+			ssid = 'paderborn.freifunk.net',
+		},
+
+		ibss = {
+			ssid = '02:d1:11:13:87:ad',
+			bssid = '02:d1:11:13:87:ad',
+			mesh_mcast_rate = 12000,
+		},
 	},
 
 	-- IP address of each router
@@ -107,15 +119,6 @@
 							'ipv4 "78.46.242.24" port 10000',
 						},
 					},
-					gw03 = {
-						key = 'cf7b54f7221a26251a5970e1d404f864ff4bfed3254bd741cf754445e040b9d0',
-						remotes = {
-							'ipv6 "v6.gw03.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw03.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a01:a700:4621:d100::10" port 10000',
-							'ipv4 "31.172.8.123" port 10000',
-						},
-					},
 					gw04 = {
 						key = 'cf3855e5fa04e4c04a294cb6e8902f91c7ff7ef82bf031cc842a2b79b936677c',
 						remotes = {
@@ -155,6 +158,15 @@
 				},
 			},
 		},
+
+		-- default traffic shaping (bandwidth limit) settings
+		bandwidth_limit = {
+			enabled = false,
+			egress = 200,
+			ingress = 3000,
+		},
+
+
 	},
 
 	-- configure the autoupdater
@@ -174,7 +186,7 @@
 				-- 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://[fdca:ffee:ff12:a254::80]/stable', 'http://firmware.paderborn.freifunk.net/stable'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/stable', 'http://firmware.ffho.net/%GS/stable'},
 
 				-- Number of valid manifest signatures necessary to accept the manifest as "good".
 				good_signatures = 3,
@@ -182,49 +194,39 @@
 				-- list of public keys which are considered "good" for manifest signatures
 				pubkeys = {
 					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
+					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
 				},
 			},
 			testing = {
 				name = 'testing',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/testing','http://firmware.paderborn.freifunk.net/testing'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/testing','http://firmware.ffho.net/%GS/testing'},
 				good_signatures = 2,
 				pubkeys = {
 					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
+					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
 				},
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/experimental','http://firmware.paderborn.freifunk.net/experimental'},
+				mirrors = {'http://[fdca:ffee:ff12:a254::80]/%GS/experimental','http://firmware.ffho.net/%GS/experimental'},
 				good_signatures = 1,
 				pubkeys = {
 					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
+					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
 				},
 			},
 		},
 	},
 
-	-- default traffic shaping (bandwidth limit) settings
-	simple_tc = {
-		mesh_vpn = {
-			ifname = 'mesh-vpn',
-			enabled = false,
-			limit_egress = 200,
-			limit_ingress = 3000,
-		},
-	},
-
 	-- configure ffho-debug
 	debugserver = {
 		host = { 'debugreport.ffho.net', 'fdca:ffee:ff12:a254::deb9' },

site.mk

@@ -4,11 +4,13 @@ GLUON_SITE_PACKAGES := \
 	ffho-debug \
 	ffho-node-tuning \
 	ffho-ebtables-net-rules \
-	ffho-openwrt-migration-tools \
-	ffho-alfred-config \
+	ffho-txpower-fix \
+	ffho-site-auto-select \
 	gluon-alfred \
-	gluon-announced \
-	gluon-autoupdater \
+	gluon-respondd \
+	ffho-respondd-config \
+	ffho-autoupdater \
+	ffho-autoupdater-wifi-fallback \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-hostname \
@@ -26,14 +28,38 @@ GLUON_SITE_PACKAGES := \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-setup-mode \
-	gluon-status-page \
+	ffho-status-page \
 	iwinfo \
 	iptables \
 	haveged
 
+USB_BASIC := \
+	kmod-usb-core \
+	kmod-usb2 \
+	kmod-usb-hid
+
+USB_NIC := \
+	kmod-usb-net \
+	kmod-usb-net-asix \
+	kmod-usb-net-rtl8150 \
+	kmod-usb-net-rtl8152 \
+	kmod-usb-net-dm9601-ether
+
+ifeq ($(GLUON_TARGET),x86-generic)
+	GLUON_SITE_PACKAGES += \
+		$(USB_BASIC) \
+		$(USB_NIC)
+endif
+
+ifeq ($(GLUON_TARGET),x86-64)
+	GLUON_SITE_PACKAGES += \
+		$(USB_BASIC) \
+		$(USB_NIC) \
+		kmod-igb #APU2
+endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 0.6.5~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.7.1~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)