Release 2015.6.2

Switch autoupdater URL back to main firmware repo path
Release 2015.6.1
2015-10-15 23:03:08 +02:00 · 2015-10-14 21:20:42 +02:00 · 2015-10-14 19:39:26 +02:00 · 2015-10-11 15:17:08 +02:00 · 2015-10-05 12:34:51 +02:00 · 2015-10-04 17:05:04 +02:00
54 changed files with 537 additions and 4492 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 gluon-build
-output
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,63 +1,5 @@
 # Freifunk München Firmware Changelog

-## v2018.1
- - Updated to Gluon v2018.1
-   - Changes:
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.1.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.2.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.3.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.4.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.5.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.6.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.7.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.8.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2018.1.html
-
-## v2017.1
-
- - Updated to Gluon v2016.2.7
-   - Changes:
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.7.html
-
-## v2017.0
-
- - Updated to Gluon v2016.2.6 (upstream)
-   - Changes:
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.1.6.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.1.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.2.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.3.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.4.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.5.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.6.html
- - site.mk
-   - added GLUON_REGION = eu setting
-
-## v2016.0
- - Updated to Gluon v2016.1.5 (ffmuc fork)
-   - Changes:
-     - https://gluon.readthedocs.org/en/v2016.1/releases/v2016.1.html
-     - https://gluon.readthedocs.org/en/v2016.1.1/releases/v2016.1.1.html
-     - https://gluon.readthedocs.org/en/v2016.1.2/releases/v2016.1.2.html
-     - https://gluon.readthedocs.org/en/v2016.1.3/releases/v2016.1.3.html
-     - https://gluon.readthedocs.org/en/v2016.1.4/releases/v2016.1.4.html
-     - https://gluon.readthedocs.org/en/v2016.1.5/releases/v2016.1.5.html
-     - mesh_no_rebroadcast for mesh-on-wan (8b66da95f1887fc6068a6e9d6b6494c2ff4d2fb4)
-     - preserve wifi channels feature (76a77902e3624167e81ca6e200519468bb66d5f7)
-     - new package tecff-ath9k-broken-wifi-workaround (freifunkmuc/gluon-packages)
-     - added fix for autoupdater (8f5a7c90019085dd8f02f96ab0e7a905f82e1be0)
- - site.conf
-   - changed MTU size to 1280
-   - due to the decreased MTU fastd can now support IPv6
- - site.mk
-   - added USB support for various devices
-
-## v2015.7
- * New stable unified firmware for all segments with site-select feature
- * Raised required signatures for stable release to 3
-
 ## v2015.6.2
 * Bugfix build for welcome version

--- a/51
+++ b/51
@@ -1,51 +0,0 @@
-def _pipelineNotify(String buildStatus = 'STARTED') {
-    // build status of null means successful
-    buildStatus =  buildStatus ?: 'SUCCESSFUL'
-
-    // Default values
-    def colorName = 'RED'
-    def colorCode = '#FF0000'
-    def subject = "${buildStatus}: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'"
-    def summary = "${subject} (${env.BUILD_URL})"
-
-    // Override default values based on build status
-    if (buildStatus == 'STARTED') {
-        color = 'YELLOW'
-        colorCode = '#FFFF00'
-    } else if (buildStatus == 'SUCCESSFUL') {
-        color = 'GREEN'
-        colorCode = '#00FF00'
-    } else {
-        color = 'RED'
-        colorCode = '#FF0000'
-    }
-
-    try {
-        mattermostSend (color: colorCode, message: summary)
-    }
-    catch (e) {
-        echo 'Unable to sent Mattermost notification'
-    }
-}
-
-node {
-  try {
-      _pipelineNotify()
-
-      stage 'Checkout'
-      checkout scm
-
-      stage 'Build'
-      sh "make V=s"
-
-      stage 'Archive'
-      archive 'output/**/*'
-  }
-  catch (e) {
-      currentBuild.result = "FAILED"
-      throw e
-  }
-  finally {
-      _pipelineNotify(currentBuild.result)
-  }
-}
--- a/22
+++ b/22
@@ -1,19 +1,15 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2018.1
+GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git
+GLUON_GIT_REF := 4268d32a8d70fa734b2d025972c5caca27705142

 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key

 GLUON_TARGETS ?= \
 	ar71xx-generic \
-	ar71xx-tiny \
 	ar71xx-nand \
 	mpc85xx-generic \
-	x86-64 \
 	x86-generic \
-	x86-geode \
-	brcm2708-bcm2708 \
-	brcm2708-bcm2709
+	x86-kvm_guest

 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
 ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
@@ -46,15 +42,15 @@ build: gluon-prepare

 manifest: build
 	${GLUON_MAKE} manifest
-	mv ${GLUON_BUILD_DIR}/output .
+	mv ${GLUON_BUILD_DIR}/images .

 sign: manifest
-	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} output/images/sysupgrade/${GLUON_BRANCH}.manifest
+	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest

 ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}

-gluon-prepare: output-clean ${GLUON_BUILD_DIR}
+gluon-prepare: images-clean ${GLUON_BUILD_DIR}
 	(cd ${GLUON_BUILD_DIR} \
 	  && git remote set-url origin ${GLUON_GIT_URL} \
 	  && git fetch origin \
@@ -65,7 +61,7 @@ gluon-prepare: output-clean ${GLUON_BUILD_DIR}
 gluon-clean:
 	rm -rf ${GLUON_BUILD_DIR}

-output-clean:
-	rm -rf output
+images-clean:
+	rm -rf images

-clean: gluon-clean output-clean
+clean: gluon-clean images-clean
--- a/README.md
+++ b/README.md
@@ -2,13 +2,11 @@

 Check out this repository and execute `make`, i.e. like this:

-```bash
-git clone https://github.com/freifunkMUC/site-ffm.git site-ffm
-cd site-ffm
-make
-```
+    git clone https://github.com/freifunkMUC/site-ffm.git site-ffm
+    cd site-ffm
+    make

 ## Further Resources

-Look at the [site configuration related Gluon documentation](https://gluon.readthedocs.io/en/v2017.1.x/user/site.html)
+Look at the [site configuration related Gluon documentation](http://gluon.readthedocs.org/en/v2014.3.1/user/site.html)
 for information on site configuration options and examples from other communities.
--- a/domains/ffbay_dah.conf
+++ b/domains/ffbay_dah.conf
@@ -1,105 +0,0 @@
-{
-  domain_names = {
-    ffbay_dah = 'Freifunk München - Landkreis Dachau (DAH)'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '1d9e8816db8f3d08aa6a8a714487537785e728a614a317964b83249201dad85c',
-
-  prefix4 = '10.80.248.0/21',
-  prefix6 = 'fdef:ffc0:4fff:1e::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-umland-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.248.1',
-     ip6 = 'fdef:ffc0:4fff:1e::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            gwu01 = {
-              key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
-              remotes = {
-                '"gwu01.ffmuc.net" port 10049',
-                '"gwu01.freifunk-muenchen.de" port 10049',
-              },
-            },
-            gwu02 = {
-              key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
-              remotes = {
-                '"gwu02.ffmuc.net" port 10049',
-                '"gwu02.freifunk-muenchen.de" port 10049',
-              },
-            },
-            gwu03 = {
-              key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
-              remotes = {
-                '"gwu03.ffmuc.net" port 10049',
-                '"gwu03.freifunk-muenchen.de" port 10049',
-              },
-            },
-            gwu04 = {
-              key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
-              remotes = {
-                '"gwu04.ffmuc.net" port 10049',
-                '"gwu04.freifunk-muenchen.de" port 10049',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffbay_ebe.conf
+++ b/domains/ffbay_ebe.conf
@@ -1,105 +0,0 @@
-{
-  domain_names = {
-    ffbay_ebe = 'Freifunk München - Landkreis Ebersberg (EBE)'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '1ace12c141401772f3637c53b9d061dd9ea248205e5836c4ae5df1bea13494d6',
-
-  prefix4 = '10.80.240.0/21',
-  prefix6 = 'fdef:ffc0:4fff:21::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-umland-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.240.1',
-     ip6 = 'fdef:ffc0:4fff:21::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            gwu01 = {
-              key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
-              remotes = {
-                '"gwu01.ffmuc.net" port 10062',
-                '"gwu01.freifunk-muenchen.de" port 10062',
-              },
-            },
-            gwu02 = {
-              key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
-              remotes = {
-                '"gwu02.ffmuc.net" port 10062',
-                '"gwu02.freifunk-muenchen.de" port 10062',
-              },
-            },
-            gwu03 = {
-              key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
-              remotes = {
-                '"gwu03.ffmuc.net" port 10062',
-                '"gwu03.freifunk-muenchen.de" port 10062',
-              },
-            },
-            gwu04 = {
-              key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
-              remotes = {
-                '"gwu04.ffmuc.net" port 10062',
-                '"gwu04.freifunk-muenchen.de" port 10062',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffbay_ed.conf
+++ b/domains/ffbay_ed.conf
@@ -1,105 +0,0 @@
-{
-  domain_names = {
-    ffbay_ed = 'Freifunk München - Landkreis Erding (ED)'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = 'fd1d60e6df9c1ed61b7cc86a5bc76b65c9971fdce409d7d9035ac91c549f2fee',
-
-  prefix4 = '10.80.16.0/21',
-  prefix6 = 'fdef:ffc0:4fff:20::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-umland-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.16.1',
-     ip6 = 'fdef:ffc0:4fff:20::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            gwu01 = {
-              key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
-              remotes = {
-                '"gwu01.ffmuc.net" port 10061',
-                '"gwu01.freifunk-muenchen.de" port 10061',
-              },
-            },
-            gwu02 = {
-              key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
-              remotes = {
-                '"gwu02.ffmuc.net" port 10061',
-                '"gwu02.freifunk-muenchen.de" port 10061',
-              },
-            },
-            gwu03 = {
-              key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
-              remotes = {
-                '"gwu03.ffmuc.net" port 10061',
-                '"gwu03.freifunk-muenchen.de" port 10061',
-              },
-            },
-            gwu04 = {
-              key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
-              remotes = {
-                '"gwu04.ffmuc.net" port 10061',
-                '"gwu04.freifunk-muenchen.de" port 10061',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffbay_ffb.conf
+++ b/domains/ffbay_ffb.conf
@@ -1,106 +0,0 @@
-{
-  domain_names = {
-    ffbay_ffb = 'Freifunk München - Landkreis Fürstenfeldbruck (FFB)'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = 'ae860ed0953464e4412623ae48061f6a619ce7cbe64246d8100578c5a74028a1',
-
-  prefix4 = '10.80.232.0/21',
-  prefix6 = 'fdef:ffc0:4fff:1d::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-umland-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.232.1',
-     ip6 = 'fdef:ffc0:4fff:1d::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            gwu01 = {
-              key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
-              remotes = {
-                '"gwu01.ffmuc.net" port 10048',
-                '"gwu01.freifunk-muenchen.de" port 10048',
-              },
-            },
-            gwu02 = {
-              key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
-              remotes = {
-                '"gwu02.ffmuc.net" port 10048',
-                '"gwu02.freifunk-muenchen.de" port 10048',
-              },
-            },
-            gwu03 = {
-              key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
-              remotes = {
-                '"gwu03.ffmuc.net" port 10048',
-                '"gwu03.freifunk-muenchen.de" port 10048',
-              },
-            },
-            gwu04 = {
-              key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
-              remotes = {
-                '"gwu04.ffmuc.net" port 10048',
-                '"gwu04.freifunk-muenchen.de" port 10048',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffbay_fs.conf
+++ b/domains/ffbay_fs.conf
@@ -1,105 +0,0 @@
-{
-  domain_names = {
-    ffbay_fs = 'Freifunk München - Landkreis Freising (FS)'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '022cb1bed51c6218c6ab94c1d1481625c83ffecad94e59481234e8ff59c9e513',
-
-  prefix4 = '10.80.224.0/21',
-  prefix6 = 'fdef:ffc0:4fff:1f::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-umland-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.224.1',
-     ip6 = 'fdef:ffc0:4fff:1f::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            gwu01 = {
-              key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
-              remotes = {
-                '"gwu01.ffmuc.net" port 10050',
-                '"gwu01.freifunk-muenchen.de" port 10050',
-              },
-            },
-            gwu02 = {
-              key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
-              remotes = {
-                '"gwu02.ffmuc.net" port 10050',
-                '"gwu02.freifunk-muenchen.de" port 10050',
-              },
-            },
-            gwu03 = {
-              key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
-              remotes = {
-                '"gwu03.ffmuc.net" port 10050',
-                '"gwu03.freifunk-muenchen.de" port 10050',
-              },
-            },
-            gwu04 = {
-              key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
-              remotes = {
-                '"gwu04.ffmuc.net" port 10050',
-                '"gwu04.freifunk-muenchen.de" port 10050',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffbay_sta.conf
+++ b/domains/ffbay_sta.conf
@@ -1,105 +0,0 @@
-{
-  domain_names = {
-    ffbay_sta = 'Freifunk München - Landkreis Starnberg (STA)'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '4e9804e7492798ae61b03e400fcd2d08cc185241a3f69399ff2f038b1724ddbf',
-
-  prefix4 = '10.80.0.0/21',
-  prefix6 = 'fdef:ffc0:4fff:1c::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-umland-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.0.1',
-     ip6 = 'fdef:ffc0:4fff:1c::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            gwu01 = {
-              key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
-              remotes = {
-                '"gwu01.ffmuc.net" port 10047',
-                '"gwu01.freifunk-muenchen.de" port 10047',
-              },
-            },
-            gwu02 = {
-              key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
-              remotes = {
-                '"gwu02.ffmuc.net" port 10047',
-                '"gwu02.freifunk-muenchen.de" port 10047',
-              },
-            },
-            gwu03 = {
-              key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
-              remotes = {
-                '"gwu03.ffmuc.net" port 10047',
-                '"gwu03.freifunk-muenchen.de" port 10047',
-              },
-            },
-            gwu04 = {
-              key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
-              remotes = {
-                '"gwu04.ffmuc.net" port 10047',
-                '"gwu04.freifunk-muenchen.de" port 10047',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffbay_tol.conf
+++ b/domains/ffbay_tol.conf
@@ -1,105 +0,0 @@
-{
-  domain_names = {
-    ffbay_tol = 'Freifunk München - Landkreis Bad Tölz-Wolfratshausen (TÖL)'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '8f741d9763d0e0c0a7e80f99a7a3d4a8bd71a43238db7d89b7722ccb69c1ba88',
-
-  prefix4 = '10.80.8.0/21',
-  prefix6 = 'fdef:ffc0:4fff:22::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-umland-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.8.1',
-     ip6 = 'fdef:ffc0:4fff:22::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            gwu01 = {
-              key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
-              remotes = {
-                '"gwu01.ffmuc.net" port 10063',
-                '"gwu01.freifunk-muenchen.de" port 10063',
-              },
-            },
-            gwu02 = {
-              key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
-              remotes = {
-                '"gwu02.ffmuc.net" port 10063',
-                '"gwu02.freifunk-muenchen.de" port 10063',
-              },
-            },
-            gwu03 = {
-              key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
-              remotes = {
-                '"gwu03.ffmuc.net" port 10063',
-                '"gwu03.freifunk-muenchen.de" port 10063',
-              },
-            },
-            gwu04 = {
-              key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
-              remotes = {
-                '"gwu04.ffmuc.net" port 10063',
-                '"gwu04.freifunk-muenchen.de" port 10063',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc.conf
+++ b/domains/ffmuc.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc = 'Freifunk München [ALT]'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = 'a4eda400cdbc351fb139da7e3c9242aefffdfa566320d429fe596f41a60e3ba4',
-
-  prefix4 = '10.80.32.0/19',
-  prefix6 = 'fdef:ffc0:4fff::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-    ip4 = '10.80.32.1',
-    ip6 = 'fdef:ffc0:4fff::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10001',
-                '"gw01.freifunk-muenchen.de" port 10001',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10001',
-                '"gw02.freifunk-muenchen.de" port 10001',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10001',
-                '"gw03.freifunk-muenchen.de" port 10001',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10001',
-                '"gw04.freifunk-muenchen.de" port 10001',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10001',
-                '"gw05.freifunk-muenchen.de" port 10001',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc01.conf
+++ b/domains/ffmuc01.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc01 = 'Freifunk München - Altstadt-Lehel'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '1e38d844ba2ebe5aa1b619dd786426476019387f548759606429db0aebc6e354',
-
-  prefix4 = '10.80.132.0/22',
-  prefix6 = 'fdef:ffc0:4fff:3::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-    ip4 = '10.80.132.1',
-    ip6 = 'fdef:ffc0:4fff:3::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10021',
-                '"gw01.freifunk-muenchen.de" port 10021',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10021',
-                '"gw02.freifunk-muenchen.de" port 10021',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10021',
-                '"gw03.freifunk-muenchen.de" port 10021',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10021',
-                '"gw04.freifunk-muenchen.de" port 10021',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10021',
-                '"gw05.freifunk-muenchen.de" port 10021',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc02.conf
+++ b/domains/ffmuc02.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc02 = 'Freifunk München - Ludwigsvorstadt-Isarvorstadt'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '7a6b67f274ee6fd0c0a0972906391e94792f9c73c1bb9a2adcb633838720c680',
-
-  prefix4 = '10.80.164.0/22',
-  prefix6 = 'fdef:ffc0:4fff:4::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-    ip4 = '10.80.164.1',
-    ip6 = 'fdef:ffc0:4fff:4::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10022',
-                '"gw01.freifunk-muenchen.de" port 10022',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10022',
-                '"gw02.freifunk-muenchen.de" port 10022',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10022',
-                '"gw03.freifunk-muenchen.de" port 10022',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10022',
-                '"gw04.freifunk-muenchen.de" port 10022',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10022',
-                '"gw05.freifunk-muenchen.de" port 10022',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc03.conf
+++ b/domains/ffmuc03.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc03 = 'Freifunk München - Maxvorstadt'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '708de6e9983ddcda67a7d38c1dbbc66032b96adbc6b302b6df9e6974a8eac2d7',
-
-  prefix4 = '10.80.168.0/22',
-  prefix6 = 'fdef:ffc0:4fff:5::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-    ip4 = '10.80.168.1',
-    ip6 = 'fdef:ffc0:4fff:5::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10023',
-                '"gw01.freifunk-muenchen.de" port 10023',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10023',
-                '"gw02.freifunk-muenchen.de" port 10023',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10023',
-                '"gw03.freifunk-muenchen.de" port 10023',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10023',
-                '"gw04.freifunk-muenchen.de" port 10023',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10023',
-                '"gw05.freifunk-muenchen.de" port 10023',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc04.conf
+++ b/domains/ffmuc04.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc04 = 'Freifunk München - Schwabing-West'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = 'b9f15c36c59dcb57d5b05424199dbe8e5f37084a8c0b401448616c65ac06c790',
-
-  prefix4 = '10.80.200.0/22',
-  prefix6 = 'fdef:ffc0:4fff:6::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-    ip4 = '10.80.200.1',
-    ip6 = 'fdef:ffc0:4fff:6::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10024',
-                '"gw01.freifunk-muenchen.de" port 10024',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10024',
-                '"gw02.freifunk-muenchen.de" port 10024',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10024',
-                '"gw03.freifunk-muenchen.de" port 10024',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10024',
-                '"gw04.freifunk-muenchen.de" port 10024',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10024',
-                '"gw05.freifunk-muenchen.de" port 10024',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc05.conf
+++ b/domains/ffmuc05.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc05 = 'Freifunk München - Au-Haidhausen'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = 'ce7da86ff25fcbf06ddc5840b7c396b0c95fa868265cd987a0e5bc89ea5978eb',
-
-  prefix4 = '10.80.136.0/22',
-  prefix6 = 'fdef:ffc0:4fff:7::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.136.1',
-     ip6 = 'fdef:ffc0:4fff:7::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10025',
-                '"gw01.freifunk-muenchen.de" port 10025',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10025',
-                '"gw02.freifunk-muenchen.de" port 10025',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10025',
-                '"gw03.freifunk-muenchen.de" port 10025',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10025',
-                '"gw04.freifunk-muenchen.de" port 10025',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10025',
-                '"gw05.freifunk-muenchen.de" port 10025',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc06.conf
+++ b/domains/ffmuc06.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc06 = 'Freifunk München - Sendling'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '439cc38e42efdd097c39ba3ec5a805cca27a59a0b68379524ee454d1bc6bd092',
-
-  prefix4 = '10.80.212.0/22',
-  prefix6 = 'fdef:ffc0:4fff:8::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.212.1',
-     ip6 = 'fdef:ffc0:4fff:8::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10026',
-                '"gw01.freifunk-muenchen.de" port 10026',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10026',
-                '"gw02.freifunk-muenchen.de" port 10026',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10026',
-                '"gw03.freifunk-muenchen.de" port 10026',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10026',
-                '"gw04.freifunk-muenchen.de" port 10026',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10026',
-                '"gw05.freifunk-muenchen.de" port 10026',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc07.conf
+++ b/domains/ffmuc07.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc07 = 'Freifunk München - Sendling-Westpark'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '0630935640caac0cc22e7599ad86b0bf5ecdd94918c38fcbf44e1ae750c68e6f',
-
-  prefix4 = '10.80.208.0/22',
-  prefix6 = 'fdef:ffc0:4fff:9::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.208.1',
-     ip6 = 'fdef:ffc0:4fff:9::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10027',
-                '"gw01.freifunk-muenchen.de" port 10027',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10027',
-                '"gw02.freifunk-muenchen.de" port 10027',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10027',
-                '"gw03.freifunk-muenchen.de" port 10027',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10027',
-                '"gw04.freifunk-muenchen.de" port 10027',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10027',
-                '"gw05.freifunk-muenchen.de" port 10027',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc08.conf
+++ b/domains/ffmuc08.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc08 = 'Freifunk München - Schwanthalerhöhe'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '22b514c990c0ab4b4bb4123309348ecec136aeca0c4045f2bd6ff37a8b663463',
-
-  prefix4 = '10.80.204.0/22',
-  prefix6 = 'fdef:ffc0:4fff:a::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.204.1',
-     ip6 = 'fdef:ffc0:4fff:a::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10028',
-                '"gw01.freifunk-muenchen.de" port 10028',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10028',
-                '"gw02.freifunk-muenchen.de" port 10028',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10028',
-                '"gw03.freifunk-muenchen.de" port 10028',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10028',
-                '"gw04.freifunk-muenchen.de" port 10028',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10028',
-                '"gw05.freifunk-muenchen.de" port 10028',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc09.conf
+++ b/domains/ffmuc09.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc09 = 'Freifunk München - Neuhausen-Nymphenburg'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = 'bc6f7190d8b2541aface536b2e4a22fe0f6912a9a8b5da6450238b388803e789',
-
-  prefix4 = '10.80.180.0/22',
-  prefix6 = 'fdef:ffc0:4fff:b::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.180.1',
-     ip6 = 'fdef:ffc0:4fff:b::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10029',
-                '"gw01.freifunk-muenchen.de" port 10029',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10029',
-                '"gw02.freifunk-muenchen.de" port 10029',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10029',
-                '"gw03.freifunk-muenchen.de" port 10029',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10029',
-                '"gw04.freifunk-muenchen.de" port 10029',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10029',
-                '"gw05.freifunk-muenchen.de" port 10029',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc10.conf
+++ b/domains/ffmuc10.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc10 = 'Freifunk München - Moosach'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '289a757f8d02ed62ea23b05aa2e67c56d49378d135fe73c7500c4134242e4b55',
-
-  prefix4 = '10.80.176.0/22',
-  prefix6 = 'fdef:ffc0:4fff:c::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.176.1',
-     ip6 = 'fdef:ffc0:4fff:c::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10030',
-                '"gw01.freifunk-muenchen.de" port 10030',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10030',
-                '"gw02.freifunk-muenchen.de" port 10030',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10030',
-                '"gw03.freifunk-muenchen.de" port 10030',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10030',
-                '"gw04.freifunk-muenchen.de" port 10030',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10030',
-                '"gw05.freifunk-muenchen.de" port 10030',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc11.conf
+++ b/domains/ffmuc11.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc11 = 'Freifunk München - Milbertshofen-Am-Hart'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '33881e20e3d44e39f38b5cdfc210e32fd59c3654792cfeb759f09a3e82752228',
-
-  prefix4 = '10.80.172.0/22',
-  prefix6 = 'fdef:ffc0:4fff:d::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.172.1',
-     ip6 = 'fdef:ffc0:4fff:d::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10031',
-                '"gw01.freifunk-muenchen.de" port 10031',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10031',
-                '"gw02.freifunk-muenchen.de" port 10031',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10031',
-                '"gw03.freifunk-muenchen.de" port 10031',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10031',
-                '"gw04.freifunk-muenchen.de" port 10031',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10031',
-                '"gw05.freifunk-muenchen.de" port 10031',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc12.conf
+++ b/domains/ffmuc12.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc12 = 'Freifunk München - Schwabing-Freimann'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '05fca4c54c9c922718fa4aafb97b8b77f61e1a886cfd7ca6ffd0a595ffc1e558',
-
-  prefix4 = '10.80.196.0/22',
-  prefix6 = 'fdef:ffc0:4fff:e::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.196.1',
-     ip6 = 'fdef:ffc0:4fff:e::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10032',
-                '"gw01.freifunk-muenchen.de" port 10032',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10032',
-                '"gw02.freifunk-muenchen.de" port 10032',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10032',
-                '"gw03.freifunk-muenchen.de" port 10032',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10032',
-                '"gw04.freifunk-muenchen.de" port 10032',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10032',
-                '"gw05.freifunk-muenchen.de" port 10032',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc13.conf
+++ b/domains/ffmuc13.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc13 = 'Freifunk München - Bogenhausen'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '55010e14573d89b104e59de3c160a04de51e3af6cd35700d8c82f946729c876b',
-
-  prefix4 = '10.80.148.0/22',
-  prefix6 = 'fdef:ffc0:4fff:f::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.148.1',
-     ip6 = 'fdef:ffc0:4fff:f::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10033',
-                '"gw01.freifunk-muenchen.de" port 10033',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10033',
-                '"gw02.freifunk-muenchen.de" port 10033',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10033',
-                '"gw03.freifunk-muenchen.de" port 10033',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10033',
-                '"gw04.freifunk-muenchen.de" port 10033',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10033',
-                '"gw05.freifunk-muenchen.de" port 10033',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc14.conf
+++ b/domains/ffmuc14.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc14 = 'Freifunk München - Berg am Laim'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '7f352cd2fe36b3e758383ce8fdbff878268ced7ff1c7457eaf777b368d6856c3',
-
-  prefix4 = '10.80.144.0/22',
-  prefix6 = 'fdef:ffc0:4fff:10::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.144.1',
-     ip6 = 'fdef:ffc0:4fff:10::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10034',
-                '"gw01.freifunk-muenchen.de" port 10034',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10034',
-                '"gw02.freifunk-muenchen.de" port 10034',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10034',
-                '"gw03.freifunk-muenchen.de" port 10034',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10034',
-                '"gw04.freifunk-muenchen.de" port 10034',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10034',
-                '"gw05.freifunk-muenchen.de" port 10034',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc15.conf
+++ b/domains/ffmuc15.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc15 = 'Freifunk München - Trudering-Riem'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '56984392d5a4d94642348173679ea7ef1de35a5a8d5e3e799fc4f742ae6c8b83',
-
-  prefix4 = '10.80.220.0/22',
-  prefix6 = 'fdef:ffc0:4fff:11::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.220.1',
-     ip6 = 'fdef:ffc0:4fff:11::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10035',
-                '"gw01.freifunk-muenchen.de" port 10035',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10035',
-                '"gw02.freifunk-muenchen.de" port 10035',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10035',
-                '"gw03.freifunk-muenchen.de" port 10035',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10035',
-                '"gw04.freifunk-muenchen.de" port 10035',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10035',
-                '"gw05.freifunk-muenchen.de" port 10035',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc16.conf
+++ b/domains/ffmuc16.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc16 = 'Freifunk München - Ramersdorf-Perlach'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = 'deb4f653140eed3ecf02888b6e37570a29559a761be9fd27479e6314d66e6c60',
-
-  prefix4 = '10.80.192.0/22',
-  prefix6 = 'fdef:ffc0:4fff:12::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.192.1',
-     ip6 = 'fdef:ffc0:4fff:12::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10036',
-                '"gw01.freifunk-muenchen.de" port 10036',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10036',
-                '"gw02.freifunk-muenchen.de" port 10036',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10036',
-                '"gw03.freifunk-muenchen.de" port 10036',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10036',
-                '"gw04.freifunk-muenchen.de" port 10036',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10036',
-                '"gw05.freifunk-muenchen.de" port 10036',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc17.conf
+++ b/domains/ffmuc17.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc17 = 'Freifunk München - Giesing'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '77f48920396a377152ea280c7d2ac6036c0357bb2a15dc6c2af2763b20aa5fa9',
-
-  prefix4 = '10.80.184.0/22',
-  prefix6 = 'fdef:ffc0:4fff:13::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.184.1',
-     ip6 = 'fdef:ffc0:4fff:13::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10037',
-                '"gw01.freifunk-muenchen.de" port 10037',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10037',
-                '"gw02.freifunk-muenchen.de" port 10037',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10037',
-                '"gw03.freifunk-muenchen.de" port 10037',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10037',
-                '"gw04.freifunk-muenchen.de" port 10037',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10037',
-                '"gw05.freifunk-muenchen.de" port 10037',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc19.conf
+++ b/domains/ffmuc19.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc19 = 'Freifunk München - Thalkirchen-Obersendling-Forstenried-Fürstenried-Solln'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '8da3f1be19f86bee2c8eb67da76389a175c0d17eb8a5955205dc66d1a4539c89',
-
-  prefix4 = '10.80.216.0/22',
-  prefix6 = 'fdef:ffc0:4fff:14::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.216.1',
-     ip6 = 'fdef:ffc0:4fff:14::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10039',
-                '"gw01.freifunk-muenchen.de" port 10039',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10039',
-                '"gw02.freifunk-muenchen.de" port 10039',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10039',
-                '"gw03.freifunk-muenchen.de" port 10039',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10039',
-                '"gw04.freifunk-muenchen.de" port 10039',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10039',
-                '"gw05.freifunk-muenchen.de" port 10039',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc20.conf
+++ b/domains/ffmuc20.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc20 = 'Freifunk München - Hadern'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '872e43ff8980a6cf6c3f1961b0d75f7cc9ec771e9744870d268787052fd1012b',
-
-  prefix4 = '10.80.156.0/22',
-  prefix6 = 'fdef:ffc0:4fff:15::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.156.1',
-     ip6 = 'fdef:ffc0:4fff:15::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10040',
-                '"gw01.freifunk-muenchen.de" port 10040',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10040',
-                '"gw02.freifunk-muenchen.de" port 10040',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10040',
-                '"gw03.freifunk-muenchen.de" port 10040',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10040',
-                '"gw04.freifunk-muenchen.de" port 10040',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10040',
-                '"gw05.freifunk-muenchen.de" port 10040',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc21.conf
+++ b/domains/ffmuc21.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc21 = 'Freifunk München - Pasing-Obermenzing'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '84d419be7358ed420a099077ab93a0c6e758cc3d8ac1f4aea43eb1b32dd910f6',
-
-  prefix4 = '10.80.188.0/22',
-  prefix6 = 'fdef:ffc0:4fff:16::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.188.1',
-     ip6 = 'fdef:ffc0:4fff:16::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10041',
-                '"gw01.freifunk-muenchen.de" port 10041',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10041',
-                '"gw02.freifunk-muenchen.de" port 10041',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10041',
-                '"gw03.freifunk-muenchen.de" port 10041',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10041',
-                '"gw04.freifunk-muenchen.de" port 10041',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10041',
-                '"gw05.freifunk-muenchen.de" port 10041',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc22.conf
+++ b/domains/ffmuc22.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc22 = 'Freifunk München - Aubing-Lochhausen-Langwied'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '08fdc1822d39ed392fc39d3d288fba05ca06080378011e75b88e56cc701d02ff',
-
-  prefix4 = '10.80.140.0/22',
-  prefix6 = 'fdef:ffc0:4fff:17::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.140.1',
-     ip6 = 'fdef:ffc0:4fff:17::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10042',
-                '"gw01.freifunk-muenchen.de" port 10042',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10042',
-                '"gw02.freifunk-muenchen.de" port 10042',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10042',
-                '"gw03.freifunk-muenchen.de" port 10042',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10042',
-                '"gw04.freifunk-muenchen.de" port 10042',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10042',
-                '"gw05.freifunk-muenchen.de" port 10042',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc23.conf
+++ b/domains/ffmuc23.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc23 = 'Freifunk München - Allach-Untermenzing'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '2b46dad9cee72c4ee9fe94b38ceaeb995c9a3e783223360cc2cb79c82eca469c',
-
-  prefix4 = '10.80.128.0/22',
-  prefix6 = 'fdef:ffc0:4fff:18::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.128.1',
-     ip6 = 'fdef:ffc0:4fff:18::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10043',
-                '"gw01.freifunk-muenchen.de" port 10043',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10043',
-                '"gw02.freifunk-muenchen.de" port 10043',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10043',
-                '"gw03.freifunk-muenchen.de" port 10043',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10043',
-                '"gw04.freifunk-muenchen.de" port 10043',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10043',
-                '"gw05.freifunk-muenchen.de" port 10043',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc24.conf
+++ b/domains/ffmuc24.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc24 = 'Freifunk München - Feldmoching-Hasenbergl'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = 'eca82a3a6c04b0cbd459e1839a2bea43660168d0dfdbdd746d14676d49af73b5',
-
-  prefix4 = '10.80.152.0/22',
-  prefix6 = 'fdef:ffc0:4fff:19::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.152.1',
-     ip6 = 'fdef:ffc0:4fff:19::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10044',
-                '"gw01.freifunk-muenchen.de" port 10044',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10044',
-                '"gw02.freifunk-muenchen.de" port 10044',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10044',
-                '"gw03.freifunk-muenchen.de" port 10044',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10044',
-                '"gw04.freifunk-muenchen.de" port 10044',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10044',
-                '"gw05.freifunk-muenchen.de" port 10044',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc25.conf
+++ b/domains/ffmuc25.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc25 = 'Freifunk München - Laim'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = 'bbc49d35f05b72b5ebaa709e0761881dbcd7cdfd3183d604757f64d4e48aa8a5',
-
-  prefix4 = '10.80.160.0/22',
-  prefix6 = 'fdef:ffc0:4fff:1a::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.160.1',
-     ip6 = 'fdef:ffc0:4fff:1a::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10045',
-                '"gw01.freifunk-muenchen.de" port 10045',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10045',
-                '"gw02.freifunk-muenchen.de" port 10045',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10045',
-                '"gw03.freifunk-muenchen.de" port 10045',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10045',
-                '"gw04.freifunk-muenchen.de" port 10045',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10045',
-                '"gw05.freifunk-muenchen.de" port 10045',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc_land.conf
+++ b/domains/ffmuc_land.conf
@@ -1,112 +0,0 @@
-{
-  domain_names = {
-    ffmuc_land = 'Freifunk München - München-Land'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = 'd6aecdc385737430aa9fd65f3f632756e8da75dbe45c5d30fc07d9afb0832dab',
-
-  prefix4 = '10.80.24.0/21',
-  prefix6 = 'fdef:ffc0:4fff:1b::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-  ip4 = '10.80.24.1',
-     ip6 = 'fdef:ffc0:4fff:1b::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gw01 = {
-              key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
-              remotes = {
-                '"gw01.ffmuc.net" port 10046',
-                '"gw01.freifunk-muenchen.de" port 10046',
-              },
-            },
-            gw02 = {
-              key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
-              remotes = {
-                '"gw02.ffmuc.net" port 10046',
-                '"gw02.freifunk-muenchen.de" port 10046',
-              },
-            },
-            gw03 = {
-              key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-              remotes = {
-                '"gw03.ffmuc.net" port 10046',
-                '"gw03.freifunk-muenchen.de" port 10046',
-              },
-            },
-            gw04 = {
-              key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-              remotes = {
-                '"gw04.ffmuc.net" port 10046',
-                '"gw04.freifunk-muenchen.de" port 10046',
-              },
-            },
-            gw05 = {
-              key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-              remotes = {
-                '"gw05.ffmuc.net" port 10046',
-                '"gw05.freifunk-muenchen.de" port 10046',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc_umland.conf
+++ b/domains/ffmuc_umland.conf
@@ -1,105 +0,0 @@
-{
-  domain_names = {
-    ffmuc_umland = 'Freifunk München Umland [ALT]'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = 'c88cf5e6bd3d289d7fa1aa67f606116d48b8d7848af6a3216adfe7592f68aaea',
-
-  prefix4 = '10.80.96.0/19',
-  prefix6 = 'fdef:ffc0:4fff:2::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-umland-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-    ip4 = '10.80.32.1',
-    ip6 = 'fdef:ffc0:4fff::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-          limit = 1,
-          peers = {
-            gwu01 = {
-              key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
-              remotes = {
-                '"gwu01.ffmuc.net" port 10015',
-                '"gwu01.freifunk-muenchen.de" port 10015',
-              },
-            },
-            gwu02 = {
-              key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
-              remotes = {
-                '"gwu02.ffmuc.net" port 10015',
-                '"gwu02.freifunk-muenchen.de" port 10015',
-              },
-            },
-            gwu03 = {
-              key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
-              remotes = {
-                '"gwu03.ffmuc.net" port 10015',
-                '"gwu03.freifunk-muenchen.de" port 10015',
-              },
-            },
-            gwu04 = {
-              key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
-              remotes = {
-                '"gwu04.ffmuc.net" port 10015',
-                '"gwu04.freifunk-muenchen.de" port 10015',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/domains/ffmuc_welcome.conf
+++ b/domains/ffmuc_welcome.conf
@@ -1,105 +0,0 @@
-{
-  domain_names = {
-    ffmuc_welcome = 'Freifunk München Welcome'
-  },
-
-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
-
-  domain_seed = '7c147ed35137c0ebf6460b593b0e3fed347759606be68c46ebacebce1364c142',
-
-  prefix4 = '10.80.64.0/19',
-  prefix6 = 'fdef:ffc0:4fff:1::/64',
-
-  wifi24 = {
-    channel = 6,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-welcome-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.welcome',
-      bssid = '02:0E:8E:1E:61:18',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'muenchen.freifunk.net',
-    },
-    mesh = {
-      id = 'ffmuc-welcome-mesh',
-      mcast_rate = 12000,
-      disabled = true,
-    },
-    ibss = {
-      ssid = 'mesh.ffmuc.welcome',
-      bssid = '02:0E:8E:1E:61:18',
-      mcast_rate = 12000,
-    },
-  },
-
-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
-  },
-
-  next_node = {
-    ip4 = '10.80.64.1',
-    ip6 = 'fdef:ffc0:4fff:1::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  mesh_vpn = {
-    mtu = 1280,
-    fastd = {
-      methods = {'salsa2012+umac'},
-      groups = {
-        backbone = {
-        limit = 1,
-          peers = {
-            gwf01 = {
-              key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e',
-              remotes = {
-                '"gwf01.ffmuc.net" port 11001',
-                '"gwf01.freifunk-muenchen.de" port 11001',
-              },
-            },
-            gwf02 = {
-              key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35',
-              remotes = {
-                '"gwf02.ffmuc.net" port 11001',
-                '"gwf02.freifunk-muenchen.de" port 11001',
-              },
-            },
-            gwf03 = {
-              key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386',
-              remotes = {
-                '"gwf03.ffmuc.net" port 11001',
-                '"gwf03.freifunk-muenchen.de" port 11001',
-              },
-            },
-            gwf04 = {
-              key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539',
-              remotes = {
-                '"gwf04.ffmuc.net" port 11001',
-                '"gwf04.freifunk-muenchen.de" port 11001',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-}
-- vim: set ft=lua:ts=2:sw=2:et
--- a/extra/ffmuc.conf
+++ b/extra/ffmuc.conf
@@ -0,0 +1,155 @@
+{
+  hostname_prefix = '',
+  site_name = 'Freifunk München',
+  site_code = 'ffmuc',
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  prefix4 = '10.80.32.0/19',
+  prefix6 = 'fdef:ffc0:4fff::/64',
+
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
+
+  mesh_on_wan = false,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 6,
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc',
+    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_mcast_rate = 12000,
+  },
+
+  wifi5 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 44,
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc',
+    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_mcast_rate = 12000,
+  },
+
+  next_node = {
+    ip4 = '10.80.32.1',
+    ip6 = 'fdef:ffc0:4fff::1',
+    mac = '16:41:95:40:f7:dc',
+  },
+
+  fastd_mesh_vpn = {
+    methods = {'salsa2012+umac'},
+    mtu = 1426,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gw03 = {
+            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
+            remotes = {
+              'ipv4 "gw03.ffmuc.net" port 10000',
+              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw04 = {
+            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
+            remotes = {
+              'ipv4 "gw04.ffmuc.net" port 10000',
+              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw05 = {
+            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
+            remotes = {
+              'ipv4 "gw05.ffmuc.net" port 10000',
+              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw06 = {
+            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
+            remotes = {
+              'ipv4 "gw06.ffmuc.net" port 10000',
+              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw07 = {
+            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
+            remotes = {
+              'ipv4 "gw07.ffmuc.net" port 10000',
+              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw08 = {
+            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
+            remotes = {
+              'ipv4 "gw08.ffmuc.net" port 10000',
+              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw09 = {
+            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
+            remotes = {
+              'ipv4 "gw09.ffmuc.net" port 10000',
+              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw10 = {
+            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
+            remotes = {
+              'ipv4 "gw10.ffmuc.net" port 10000',
+              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+        },
+        probability = 0.1,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+        },
+        probability = 0.5,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+    },
+  },
+
+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et
--- a/extra/ffmuc_umland.conf
+++ b/extra/ffmuc_umland.conf
@@ -0,0 +1,134 @@
+{
+  hostname_prefix = '',
+  site_name = 'Freifunk München Umland',
+  site_code = 'ffmuc_umland',
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  prefix4 = '10.80.96.0/19',
+  prefix6 = 'fdef:ffc0:4fff:2::/64',
+
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
+
+  mesh_on_wan = false,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 6,
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc.umland',
+    mesh_bssid = '02:0E:8E:1E:61:19',
+    mesh_mcast_rate = 12000,
+  },
+
+  wifi5 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 44,
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc.umland',
+    mesh_bssid = '02:0E:8E:1E:61:19',
+    mesh_mcast_rate = 12000,
+  },
+
+  next_node = {
+    ip4 = '10.80.96.1',
+    ip6 = 'fdef:ffc0:4fff:2::1',
+    mac = '16:41:95:40:f7:dc',
+  },
+
+  fastd_mesh_vpn = {
+    methods = {'salsa2012+umac'},
+    mtu = 1426,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gwu01 = {
+            key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
+            remotes = {
+              'ipv4 "gwu01.ffmuc.net" port 10010',
+              'ipv4 "gwu01.freifunk-muenchen.de" port 10010',
+            },
+          },
+          gwu02 = {
+            key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
+            remotes = {
+              'ipv4 "gwu02.ffmuc.net" port 10011',
+              'ipv4 "gwu02.freifunk-muenchen.de" port 10011',
+            },
+          },
+          gwu03 = {
+            key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
+            remotes = {
+              'ipv4 "gwu03.ffmuc.net" port 10012',
+              'ipv4 "gwu03.freifunk-muenchen.de" port 10012',
+            },
+          },
+          gwu04 = {
+            key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
+            remotes = {
+              'ipv4 "gwu04.ffmuc.net" port 10013',
+              'ipv4 "gwu04.freifunk-muenchen.de" port 10013',
+            },
+          },
+          gwu05 = {
+            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
+            remotes = {
+              'ipv4 "gwu05.ffmuc.net" port 10014',
+              'ipv4 "gwu05.freifunk-muenchen.de" port 10014',
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+        },
+        probability = 0.1,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+        },
+        probability = 0.5,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+    },
+  },
+
+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et
--- a/extra/ffmuc_welcome.conf
+++ b/extra/ffmuc_welcome.conf
@@ -0,0 +1,127 @@
+{
+  hostname_prefix = 'welcome',
+  site_name = 'Freifunk München Welcome',
+  site_code = 'ffmuc_welcome',
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  prefix4 = '10.80.64.0/19',
+  prefix6 = 'fdef:ffc0:4fff:1::/64',
+
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
+
+  mesh_on_wan = false,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 6,
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc.welcome',
+    mesh_bssid = '02:0E:8E:1E:61:18',
+    mesh_mcast_rate = 12000,
+  },
+
+  wifi5 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 44,
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc.welcome',
+    mesh_bssid = '02:0E:8E:1E:61:18',
+    mesh_mcast_rate = 12000,
+  },
+
+  next_node = {
+    ip4 = '10.80.64.1',
+    ip6 = 'fdef:ffc0:4fff:1::1',
+    mac = '16:41:95:40:f7:dc',
+  },
+
+  fastd_mesh_vpn = {
+    methods = {'salsa2012+umac'},
+    mtu = 1426,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gwf01 = {
+            key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e',
+            remotes = {
+              'ipv4 "gwf01.ffmuc.net" port 11000',
+              'ipv4 "gwf01.freifunk-muenchen.de" port 11000',
+            },
+          },
+          gwf02 = {
+            key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35',
+            remotes = {
+              'ipv4 "gwf02.ffmuc.net" port 11000',
+              'ipv4 "gwf02.freifunk-muenchen.de" port 11001',
+            },
+          },
+          gwf03 = {
+            key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386',
+            remotes = {
+              'ipv4 "gwf03.ffmuc.net" port 11000',
+              'ipv4 "gwf03.freifunk-muenchen.de" port 11002',
+            },
+          },
+          gwf04 = {
+            key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539',
+            remotes = {
+              'ipv4 "gwf04.ffmuc.net" port 11000',
+              'ipv4 "gwf04.freifunk-muenchen.de" port 11003',
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+        },
+        probability = 0.1,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+        },
+        probability = 0.5,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+    },
+  },
+
+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2018-08-01 19:31+0200\n"
-"Last-Translator: Matthias Kesler <krombel@krombel.de>\n"
+"PO-Revision-Date: 2015-05-16 19:31+0200\n"
+"Last-Translator: Franz Pletz <fpletz@fnordicwalking.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -16,28 +16,16 @@ msgstr ""
 "Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
 "entsprechend aus und sende es ab."

-msgid "gluon-config-mode:domain"
-msgstr "Domäne"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Hier hast du die Möglichkeit, die Mesh-Domäne, in der sich dein Knoten "
-"befindet, auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den "
-"Knoten der ausgewählten Domäne verbinden kann."
-
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-" "
-

 msgid "gluon-config-mode:reboot"
 msgstr ""
-"<p>Dein Knoten <em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"anschließend versuchen, sich mit anderen Freifunk-Knoten in seiner Nähe zu "
-"verbinden. Weitere Informationen zur "
-"Münchner Freifunk-Community findest du auf "
-"<a href=\"https://ffmuc.net/\">unserer Webseite</a>.</p>"
-"Wenn alles geklappt hat, wirst du in ein paar Minuten unter "
+"<p>Dein Knoten startet gerade neu und wird anschließend versuchen, sich "
+"mit anderen Freifunk-Knoten in seiner Nähe zu verbinden. Weitere "
+"Informationen zur Münchner Freifunk-Community findest du auf "
+"<a href=\"https://ffmuc.net/\">unserer Webseite</a>. Wenn "
+"alles geklappt hat, wirst du in ein paar Minuten unter "
 "<a href=\"https://ffmuc.net/map/\">ffmuc.net/map/</a> "
 "deinen Knoten finden.</p> "
 "<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
@@ -51,29 +39,3 @@ msgstr ""
 "mitzumachen. Voraussetzung ist eine persönliche Anmeldung auf einem "
 "der Treffen.</p> "
 "<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
-"exakter Wert bekannt ist."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2018-08-01 19:31+0200\n"
-"Last-Translator: Matthias Kesler <krombel@krombel.de>\n"
+"PO-Revision-Date: 2015-05-16 19:31+0200\n"
+"Last-Translator: Franz Pletz <fpletz@fnordicwalking.de>\n"
 "Language-Team: English\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
@@ -12,64 +12,19 @@ msgstr ""

 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Welcome to the setup wizard of your new Freifunk Munich node. "
-"Please fill out the following form and submit it."
-
-msgid "gluon-config-mode:domain"
-msgstr "Domain"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-"Here you have the possibility of selecting the mesh domain in which your node "
-"is placed. Please keep in mind that your router only connects with the nodes "
-"of the selected domain"
+"Welcome the the setup wizard of your new Freifunk Munich node. "
+"Please fill out the following form and transmit it."

 msgid "gluon-config-mode:pubkey"
 msgstr ""
-" "
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>You have selected <strong>not</strong> to use the mesh VPN. "
-"Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"

 msgid "gluon-config-mode:reboot"
 msgstr ""
-"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"try to connect to other nearby Freifunk nodes after that. For more "
-"information about the Freifunk community in Munich, have a look at "
-"<a href=\"https://ffmuc.net/\">our homepage</a>.</p>"
-"Your node should appear on our map at "
+"<p>Your node is currently rebooting and will try to connect to other "
+"nearby Freifunk nodes. It should appear on our map at "
 "<a href=\"https://ffmuc.net/map/\">ffmuc.net/map/</a> "
 "in a few minutes.</p> "
 "<p>To get back to this configuration interface, press the reset button for "
 "3 seconds during normal operation. The device will then reboot into config "
 "mode.</p>"
-"<p>Have fun with your node and exploring of the Freifunk network!</p>"
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
+"<p>Have fun with your node and exploring the Freifunk network!</p>"
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -1,70 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2018-08-01 20:08+0100\n"
-"Last-Translator: Matthias Kesler <krombel@krombel.de>\n"
-"Language-Team: French\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-"Bienvenue dans l'assistant de configuration pour votre nouveau nœud "
-"Freifunk. Remplissez le formulaire suivant en fonction de vos besoins "
-"et enregistrez le"
-
-msgid "gluon-config-mode:domain"
-msgstr "Domaine"
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-" "
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-"<p>Vous avez choisi de <strong>ne pas utiliser</strong> "
-"le réseau VPN. Votre nœud ne pourra se connecter au réseau Freifunk que si "
-"d'autres nœuds à portée ont déjà une connexion.</p>"
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-"<p>Votre nœud <em><%= pcdata(hostname) %></em> es en train de redémarrer et "
-"va ensuite éssayer de se connecter avec les autres nœuds du réseau Freifunk "
-"Vous pourrez trouver plus d'informations sur votre groupe Freifunk sur la page "
-"<a href=\"https://ffmuc.net/\"> de ton groupe </a>.</p> "
-"<p> Pour retrouver cette page de configuration veuillier appuyez pendant le "
-"fonctionement normal pendant 3 Secondes sur le bouton reset. L'appareil va ensuite "
-"redémarer en mode configuration.</p> "
-"<p>Profitez votre de nœud et amusez vous à découvrir le réseau Freifunk!</p>"
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Hauteur"
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-"La altitude est optionelle et ne devrait que être ajoutée si la valeur "
-"exacte est connue."
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-hostname/i18n/
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-geo-location/i18n/
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
-
-# Leave empty to use the default text, which can be found in:
-# package/gluon-config-mode-contact-info/i18n/
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
--- a/i18n/gluon-site.pot
+++ b/i18n/gluon-site.pot
@@ -1,38 +0,0 @@
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
-
-msgid "gluon-config-mode:welcome"
-msgstr ""
-
-msgid "gluon-config-mode:domain"
-msgstr ""
-
-msgid "gluon-config-mode:domain-select"
-msgstr ""
-
-msgid "gluon-config-mode:pubkey"
-msgstr ""
-
-msgid "gluon-config-mode:novpn"
-msgstr ""
-
-msgid "gluon-config-mode:reboot"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-label"
-msgstr ""
-
-msgid "gluon-config-mode:altitude-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-help"
-msgstr ""
-
-msgid "gluon-config-mode:contact-note"
-msgstr ""
-
-msgid "gluon-config-mode:hostname-help"
-msgstr ""
-
-msgid "gluon-config-mode:geo-location-help"
-msgstr ""
--- a/7
+++ b/7
@@ -1,5 +1,4 @@
-GLUON_SITE_FEEDS='ffmuc'
+GLUON_SITE_FEEDS='ffmuc_packages'

-PACKAGES_FFMUC_REPO=https://github.com/krombel/gluon-packages.git
-PACKAGES_FFMUC_BRANCH=add_domain-migration-ffmuc
-PACKAGES_FFMUC_COMMIT=d3e97b8b08f253b024d8aac29df217c065fd59c6
+PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git
+PACKAGES_FFMUC_PACKAGES_COMMIT=985bfad86005c7a9f754ddc8432d88641d8183b3
--- a/site.conf
+++ b/site.conf
@@ -1,14 +1,11 @@
 {
-  hostname_prefix = 'ffmuc-',
-  site_name = 'Freifunk München',
-  site_code = 'ffmuc',
-  default_domain = 'ffmuc_welcome',
+  hostname_prefix = 'welcome',
+  site_name = 'Freifunk München Welcome',
+  site_code = 'ffmuc_welcome',
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',

-  opkg = {
-    extra = {
-      gluon = 'http://firmware.ffmuc.net/modules/gluon-%GS-%GR/%S',
-    },
-  },
+  prefix4 = '10.80.64.0/19',
+  prefix6 = 'fdef:ffc0:4fff:1::/64',

  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
@@ -18,38 +15,66 @@
  regdom = 'DE',

  wifi24 = {
+    ssid = 'muenchen.freifunk.net',
    channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
-    mesh = {
-      mcast_rate = 12000,
-    },
-    ibss = {
-      mcast_rate = 12000,
-    },
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc.welcome',
+    mesh_bssid = '02:0E:8E:1E:61:18',
+    mesh_mcast_rate = 12000,
  },

  wifi5 = {
+    ssid = 'muenchen.freifunk.net',
    channel = 44,
-    mesh = {
-      mcast_rate = 12000,
-    },
-    ibss = {
-      mcast_rate = 12000,
-    },
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc.welcome',
+    mesh_bssid = '02:0E:8E:1E:61:18',
+    mesh_mcast_rate = 12000,
  },

-  mesh = {
-    batman_adv = {
-      gw_sel_class = 3,
-    },
+  next_node = {
+    ip4 = '10.80.64.1',
+    ip6 = 'fdef:ffc0:4fff:1::1',
+    mac = '16:41:95:40:f7:dc',
  },

-  mesh_vpn = {
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
+  fastd_mesh_vpn = {
+    methods = {'salsa2012+umac'},
+    mtu = 1426,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gwf01 = {
+            key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e',
+            remotes = {
+              'ipv4 "gwf01.ffmuc.net" port 11000',
+              'ipv4 "gwf01.freifunk-muenchen.de" port 11000',
+            },
+          },
+          gwf02 = {
+            key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35',
+            remotes = {
+              'ipv4 "gwf02.ffmuc.net" port 11000',
+              'ipv4 "gwf02.freifunk-muenchen.de" port 11001',
+            },
+          },
+          gwf03 = {
+            key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386',
+            remotes = {
+              'ipv4 "gwf03.ffmuc.net" port 11000',
+              'ipv4 "gwf03.freifunk-muenchen.de" port 11002',
+            },
+          },
+          gwf04 = {
+            key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539',
+            remotes = {
+              'ipv4 "gwf04.ffmuc.net" port 11000',
+              'ipv4 "gwf04.freifunk-muenchen.de" port 11003',
+            },
+          },
+        },
+      },
    },
  },

@@ -64,7 +89,7 @@
          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
        },
        probability = 0.1,
-        good_signatures = 3,
+        good_signatures = 2,
        pubkeys = {
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
@@ -90,5 +115,13 @@
    },
  },

+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et
--- a/site.mk
+++ b/site.mk
@@ -1,168 +1,32 @@
-GLUON_MULTIDOMAIN=1
-
-GLUON_FEATURES := \
-	respondd \
-	autoupdater \
-	web-wizard \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	web-admin \
-	web-autoupdater \
-	web-network \
-	web-wifi-config \
-	mesh-batman-adv-15 \
-	mesh-vpn-fastd \
-	radvd \
-	status-page \
-	config-mode-domain-select \
-	ebtables-filter-arp-ffmuc \
-	ebtables-filter-multicast-ffmuc \
-	domain-migration-ffmuc
-
 GLUON_SITE_PACKAGES := \
+	gluon-mesh-batman-adv-15 \
+	gluon-alfred \
+	gluon-announced \
+	gluon-autoupdater \
+	gluon-config-mode-core \
+	gluon-config-mode-autoupdater \
+	gluon-config-mode-hostname \
+	gluon-config-mode-mesh-vpn \
+	gluon-config-mode-geo-location \
+	gluon-config-mode-contact-info \
+	gluon-config-mode-site-select \
+	gluon-ebtables-filter-multicast \
+	gluon-ebtables-filter-ra-dhcp \
+	gluon-luci-admin \
+	gluon-luci-autoupdater \
+	gluon-luci-portconfig \
+	gluon-luci-wifi-config \
+	gluon-luci-private-wifi \
+	gluon-next-node \
+	gluon-mesh-vpn-fastd \
+	gluon-radvd \
+	gluon-setup-mode \
+	gluon-status-page \
 	iwinfo \
 	iptables \
 	haveged \
-	tecff-ath9k-broken-wifi-workaround \
-	tecff-respondd-watchdog
-
-# basic support for USB stack
-USB_PACKAGES_BASIC := \
-	kmod-usb-core \
-	kmod-usb2
-
-# storage support for USB devices
-USB_PACKAGES_STORAGE := \
-	block-mount \
-	blkid \
-	kmod-fs-ext4 \
-	kmod-fs-vfat \
-	kmod-usb-storage \
-	kmod-usb-storage-extras \
-	kmod-nls-cp1250 \
-	kmod-nls-cp1251 \
-	kmod-nls-cp437 \
-	kmod-nls-cp775 \
-	kmod-nls-cp850 \
-	kmod-nls-cp852 \
-	kmod-nls-cp866 \
-	kmod-nls-iso8859-1 \
-	kmod-nls-iso8859-13 \
-	kmod-nls-iso8859-15 \
-	kmod-nls-iso8859-2 \
-	kmod-nls-koi8r \
-	kmod-nls-utf8 \
-	swap-utils
-
-# network support for USB devices
-USB_PACKAGES_NET := \
-	kmod-mii \
-	kmod-nls-base \
-	kmod-usb-net \
-	kmod-usb-net-asix \
-	kmod-usb-net-asix-ax88179 \
-	kmod-usb-net-cdc-eem \
-	kmod-usb-net-cdc-ether \
-	kmod-usb-net-cdc-mbim \
-	kmod-usb-net-cdc-ncm \
-	kmod-usb-net-cdc-subset \
-	kmod-usb-net-dm9601-ether \
-	kmod-usb-net-hso \
-	kmod-usb-net-huawei-cdc-ncm \
-	kmod-usb-net-ipheth \
-	kmod-usb-net-kalmia \
-	kmod-usb-net-kaweth \
-	kmod-usb-net-mcs7830 \
-	kmod-usb-net-pegasus \
-	kmod-usb-net-qmi-wwan \
-	kmod-usb-net-rndis \
-	kmod-usb-net-sierrawireless \
-	kmod-usb-net-smsc95xx
-# broken
-#	kmod-usb-net-rtl8150 \
-#	kmod-usb-net-rtl8152 \
-
-# network support for PCI devices
-PCI_PACKAGES_NET := \
-	kmod-3c59x \
-	kmod-e100 \
-	kmod-e1000 \
-	kmod-e1000e \
-	kmod-forcedeth \
-	kmod-natsemi \
-	kmod-ne2k-pci \
-	kmod-pcnet32 \
-	kmod-r8169 \
-	kmod-sis900 \
-	kmod-sky2 \
-	kmod-tg3 \
-	kmod-tulip \
-	kmod-via-rhine
-# broken
-#	kmod-ixgbe \
-#	kmod-r8139too \
-
-# additional packages
-TOOLS_PACKAGES := \
-	iperf \
-	socat \
-	tcpdump \
-	usbutils \
-	vnstat
-# broken
-#	pciutils \
-
-#
-# $(GLUON_TARGET) specific settings:
-#
-
-# x86-generic
-ifeq ($(GLUON_TARGET),x86-generic)
-# support the usb stack on x86 devices
-# and add a few common USB and PCI NICs
-GLUON_SITE_PACKAGES += \
-	kmod-usb-hid \
-	kmod-hid-generic \
-	$(USB_PACKAGES_BASIC) \
-	$(USB_PACKAGES_STORAGE) \
-	$(USB_PACKAGES_NET) \
-	$(PCI_PACKAGES_NET) \
-	$(TOOLS_PACKAGES)
-endif
-
-# x86-64
-ifeq ($(GLUON_TARGET),x86-64)
-# support the usb stack on x86-64 devices
-# and add a few common USB and PCI NICs
-GLUON_SITE_PACKAGES += \
-	kmod-usb-hid \
-	kmod-hid-generic \
-	$(USB_PACKAGES_BASIC) \
-	$(USB_PACKAGES_STORAGE) \
-	$(USB_PACKAGES_NET) \
-	$(PCI_PACKAGES_NET) \
-	$(TOOLS_PACKAGES)
-endif
-
-ifeq ($(GLUON_TARGET),x86-kvm_guest)
-GLUON_SITE_PACKAGES += \
-	$(TOOLS_PACKAGES)
-endif
-
-# ar71xx-generic
-GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_WNDR3700_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_WRT160NL_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-
-# mpc85xx-generic
-GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+	gluon-ebtables-filter-arp-ffmuc \
+	gluon-ebtables-filter-multicast-ffmuc


 DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')
@@ -172,7 +36,5 @@ GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)

 GLUON_PRIORITY ?= 0

-GLUON_REGION ?= eu
-
 # Languages to include
 GLUON_LANGS ?= en de
--- a/util/make_siteconfs.sh
+++ b/util/make_siteconfs.sh
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-[ -e new ] || mkdir new
-
-cat makefile_prefix > new/Makefile-site-select
-
-cat stadtteile_idx.txt|grep -e '^[^#]'|grep ffmuc|while IFS=, read nr id desc port prefix4; do cp ../extra/ffmuc.conf new/$id.conf; done
-cat stadtteile_idx.txt|grep -e '^[^#]'|grep ffbay|while IFS=, read nr id desc port prefix4; do cp ../extra/ffmuc_umland.conf new/$id.conf; done
-
-cat stadtteile_idx.txt | grep -e '^[^#]' \
-    | while IFS=, read nr id desc seg_id port prefix4 prefix6 next_node4 next_node6; do (
-      echo "# processing $id.conf";
-      cat new/$id.conf | sed -e "s/port 100[01][0-9]/port $port/" \
-                             | sed -e "s/.*site_code.*/  site_code = '$id',/g" \
-                             | sed -e "s/.*site_name.*/  site_name = 'Freifunk München - $desc',/g" \
-                             | sed -e "s/.*ip4.*/  ip4 = '$next_node4',/g" \
-                             | sed -e "s@.*prefix4.*@  prefix4 = '$prefix4',@g" \
-                             | sed -e "s@.*prefix6.*@  prefix6 = '$prefix6',@g" \
-                             | sed -e "s/.ip6.*/  ip6 = '$next_node6',/g" > new/$id.conf.new;
-      mv new/$id.conf.new new/$id.conf;
-      echo "	lua -e 'print(require(\"cjson\").encode(assert(loadfile(\"site_config.lua\")(\"\$(GLUON_SITEDIR)/extra/$id.conf\"))))' > \$(1)/lib/gluon/site-select/$id.json" >> new/Makefile-site-select
-      ); \
-    done
-
-cat makefile_suffix >> new/Makefile-site-select
--- a/util/makefile_prefix
+++ b/util/makefile_prefix
@@ -1,36 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gluon-config-mode-site-select
-PKG_VERSION:=0.2
-PKG_RELEASE:=1
-
-PKG_BUILD_DEPENDS := lua-cjson/host
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
-define Package/gluon-config-mode-site-select
-  SECTION:=gluon
-  CATEGORY:=Gluon
-  TITLE:=UI for changing the node-config
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(call GluonBuildI18N,gluon-config-mode-site-select,i18n)
-endef
-
-define Package/gluon-config-mode-site-select/install
-	mkdir -p $(1)/etc/config/
-	mkdir -p $(1)/lib/gluon/site-select/
-	$(CP) ./files/* $(1)/
-
--- a/util/makefile_suffix
+++ b/util/makefile_suffix
@@ -1,6 +0,0 @@
-	DIR=$(1) sh create-config.sh
-	
-	$(call GluonInstallI18N,gluon-config-mode-site-select,$(1))
-endef
-
-$(eval $(call BuildPackage,gluon-config-mode-site-select))
--- a/util/stadtteile_idx.txt
+++ b/util/stadtteile_idx.txt
@@ -1,33 +0,0 @@
-#idx,id,description,segment_id,port,prefix4,prefix6,next_node4,next_node6
-1,ffmuc01,Altstadt-Lehel,0,10021,10.80.132.0/22,fdef:ffc0:4fff:3::/64,10.80.132.1,fdef:ffc0:4fff:3::1
-2,ffmuc02,Ludwigsvorstadt-Isarvorstadt,0,10022,10.80.164.0/22,fdef:ffc0:4fff:4::/64,10.80.164.1,fdef:ffc0:4fff:4::1
-3,ffmuc03,Maxvorstadt,0,10023,10.80.168.0/22,fdef:ffc0:4fff:5::/64,10.80.168.1,fdef:ffc0:4fff:5::1
-4,ffmuc04,Schwabing-West,0,10024,10.80.200.0/22,fdef:ffc0:4fff:6::/64,10.80.200.1,fdef:ffc0:4fff:6::1
-5,ffmuc05,Au-Haidhausen,0,10025,10.80.136.0/22,fdef:ffc0:4fff:7::/64,10.80.136.1,fdef:ffc0:4fff:7::1
-6,ffmuc06,Sendling,0,10026,10.80.212.0/22,fdef:ffc0:4fff:8::/64,10.80.212.1,fdef:ffc0:4fff:8::1
-7,ffmuc07,Sendling-Westpark,0,10027,10.80.208.0/22,fdef:ffc0:4fff:9::/64,10.80.208.1,fdef:ffc0:4fff:9::1
-8,ffmuc08,Schwanthalerhöhe,0,10028,10.80.204.0/22,fdef:ffc0:4fff:a::/64,10.80.204.1,fdef:ffc0:4fff:a::1
-9,ffmuc09,Neuhausen-Nymphenburg,0,10029,10.80.180.0/22,fdef:ffc0:4fff:b::/64,10.80.180.1,fdef:ffc0:4fff:b::1
-10,ffmuc10,Moosach,0,10030,10.80.176.0/22,fdef:ffc0:4fff:c::/64,10.80.176.1,fdef:ffc0:4fff:c::1
-11,ffmuc11,Milbertshofen-Am-Hart,0,10031,10.80.172.0/22,fdef:ffc0:4fff:d::/64,10.80.172.1,fdef:ffc0:4fff:d::1
-12,ffmuc12,Schwabing-Freimann,0,10032,10.80.196.0/22,fdef:ffc0:4fff:e::/64,10.80.196.1,fdef:ffc0:4fff:e::1
-13,ffmuc13,Bogenhausen,0,10033,10.80.148.0/22,fdef:ffc0:4fff:f::/64,10.80.148.1,fdef:ffc0:4fff:f::1
-14,ffmuc14,Berg am Laim,0,10034,10.80.144.0/22,fdef:ffc0:4fff:10::/64,10.80.144.1,fdef:ffc0:4fff:10::1
-15,ffmuc15,Trudering-Riem,0,10035,10.80.220.0/22,fdef:ffc0:4fff:11::/64,10.80.220.1,fdef:ffc0:4fff:11::1
-16,ffmuc16,Ramersdorf-Perlach,0,10036,10.80.192.0/22,fdef:ffc0:4fff:12::/64,10.80.192.1,fdef:ffc0:4fff:12::1
-17,ffmuc17,Giesing,0,10037,10.80.184.0/22,fdef:ffc0:4fff:13::/64,10.80.184.1,fdef:ffc0:4fff:13::1
-18,ffmuc19,Thalkirchen-Obersendling-Forstenried-Fürstenried-Solln,0,10039,10.80.216.0/22,fdef:ffc0:4fff:14::/64,10.80.216.1,fdef:ffc0:4fff:14::1
-29,ffmuc20,Hadern,0,10040,10.80.156.0/22,fdef:ffc0:4fff:15::/64,10.80.156.1,fdef:ffc0:4fff:15::1
-20,ffmuc21,Pasing-Obermenzing,0,10041,10.80.188.0/22,fdef:ffc0:4fff:16::/64,10.80.188.1,fdef:ffc0:4fff:16::1
-21,ffmuc22,Aubing-Lochhausen-Langwied,0,10042,10.80.140.0/22,fdef:ffc0:4fff:17::/64,10.80.140.1,fdef:ffc0:4fff:17::1
-22,ffmuc23,Allach-Untermenzing,0,10043,10.80.128.0/22,fdef:ffc0:4fff:18::/64,10.80.128.1,fdef:ffc0:4fff:18::1
-23,ffmuc24,Feldmoching-Hasenbergl,0,10044,10.80.152.0/22,fdef:ffc0:4fff:19::/64,10.80.152.1,fdef:ffc0:4fff:19::1
-24,ffmuc25,Laim,0,10045,10.80.160.0/22,fdef:ffc0:4fff:1a::/64,10.80.160.1,fdef:ffc0:4fff:1a::1
-25,ffmuc_land,München-Land,1,10046,10.80.24.0/21,fdef:ffc0:4fff:1b::/64,10.80.24.1,fdef:ffc0:4fff:1b::1
-26,ffbay_sta,Landkreis Starnberg (STA),1,10047,10.80.0.0/21,fdef:ffc0:4fff:1c::/64,10.80.0.1,fdef:ffc0:4fff:1c::1
-27,ffbay_ffb,Landkreis Fürstenfeldbruck (FFB),1,10048,10.80.232.0/21,fdef:ffc0:4fff:1d::/64,10.80.232.1,fdef:ffc0:4fff:1d::1
-28,ffbay_dah,Landkreis Dachau (DAH),1,10049,10.80.248.0/21,fdef:ffc0:4fff:1e::/64,10.80.248.1,fdef:ffc0:4fff:1e::1
-39,ffbay_fs,Landkreis Freising (FS),1,10050,10.80.224.0/21,fdef:ffc0:4fff:1f::/64,10.80.224.1,fdef:ffc0:4fff:1f::1
-30,ffbay_ed,Landkreis Erding (ED),1,10061,10.80.16.0/21,fdef:ffc0:4fff:20::/64,10.80.16.1,fdef:ffc0:4fff:20::1
-31,ffbay_ebe,Landkreis Ebersberg (EBE),1,10062,10.80.240.0/21,fdef:ffc0:4fff:21::/64,10.80.240.1,fdef:ffc0:4fff:21::1
-32,ffbay_tol,Landkreis Bad Tölz-Wolfratshausen (TÖL),1,10063,10.80.8.0/21,fdef:ffc0:4fff:22::/64,10.80.8.1,fdef:ffc0:4fff:22::1
Author	SHA1	Message	Date
Franz Pletz	0d1ff59fac	Release 2015.6.2	2015-10-15 23:03:08 +02:00
Franz Pletz	904652abdd	Switch autoupdater URL back to main firmware repo path	2015-10-14 21:20:42 +02:00
Franz Pletz	378e517ff7	Release 2015.6.1	2015-10-14 19:39:26 +02:00
Christian Obersteiner	4e8364d02b	using our own gluon-config-site-select module	2015-10-11 15:17:08 +02:00
Franz Pletz	42fe0d31fd	Remove extra site symlink, fix site code	2015-10-05 12:34:51 +02:00
Franz Pletz	53e3c5dbe8	Merge branch 'site-select' into welcome	2015-10-04 17:05:04 +02:00
Franz Pletz	b96a4d3f3a	Revert to HT20 for 2.4GHz Wifi See https://github.com/freifunk-gluon/gluon/issues/487.	2015-09-19 20:49:50 +02:00
Franz Pletz	865a7bd177	Require 2 signatures for experimental (LQFB i139)	2015-09-19 20:48:08 +02:00
Franz Pletz	d017574397	Disable mesh on WAN by default	2015-09-19 20:44:23 +02:00
Franz Pletz	739bda2a16	Change site_code & use different ports for gateways	2015-09-15 12:37:35 +02:00
Franz Pletz	bc8dfbed2e	Use correct ipv4 & ipv6 prefixes	2015-09-13 12:44:39 +02:00
Franz Pletz	bf148b9269	Changes for new partition 'welcome'	2015-09-13 12:13:40 +02:00