update to gluon-v2018.2

- update CHANGELOG.md
- updated translations (de, en)
- added french translation (just copied. Please review)
- update site.mk
  - gluon now provides a GLUON_FEATURES where all packages get
    prepended with "gluon-" automatically. This is now used
  - use GLUON_FEATURE web-wizard

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Freifunk München Firmware Changelog
 
+## v2018.1
+ - Updated to Gluon v2018.1.1
+   - Changes:
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.1.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.2.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.3.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.4.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.5.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.6.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.7.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.8.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2018.1.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2018.1.1.html
+ - site.conf
+   - use multidomain config
+   - update translations (de,en) and added french
+   - use GLUON_FEATURES
+   - use GLUON_FEATURE web-wizard to have less packages
+
 ## v2017.1
 
  - Updated to Gluon v2016.2.7

Makefile

@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2017.1.2
+GLUON_GIT_REF := v2018.2
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 

README.md

@@ -12,3 +12,7 @@ make
 
 Look at the [site configuration related Gluon documentation](https://gluon.readthedocs.io/en/v2017.1.x/user/site.html)
 for information on site configuration options and examples from other communities.
+
+## Builds
+
+Currently builds of this repo are provided at https://ffmuc.krombel.de

domains/ffbay_dah.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Landkreis Dachau (DAH)',
+    ffbay_dah = 'Freifunk München - Landkreis Dachau (DAH)'
-  site_code = 'ffbay_dah',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '1d9e8816db8f3d08aa6a8a714487537785e728a614a317964b83249201dad85c',
+
   prefix4 = '10.80.248.0/21',
   prefix6 = 'fdef:ffc0:4fff:1e::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-umland-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -105,49 +100,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffbay_ebe.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Landkreis Ebersberg (EBE)',
+    ffbay_ebe = 'Freifunk München - Landkreis Ebersberg (EBE)'
-  site_code = 'ffbay_ebe',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '1ace12c141401772f3637c53b9d061dd9ea248205e5836c4ae5df1bea13494d6',
+
   prefix4 = '10.80.240.0/21',
   prefix6 = 'fdef:ffc0:4fff:21::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-umland-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -105,49 +100,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffbay_ed.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Landkreis Erding (ED)',
+    ffbay_ed = 'Freifunk München - Landkreis Erding (ED)'
-  site_code = 'ffbay_ed',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = 'fd1d60e6df9c1ed61b7cc86a5bc76b65c9971fdce409d7d9035ac91c549f2fee',
+
   prefix4 = '10.80.16.0/21',
   prefix6 = 'fdef:ffc0:4fff:20::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-umland-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -105,49 +100,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffbay_ffb.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Landkreis Fürstenfeldbruck (FFB)',
+    ffbay_ffb = 'Freifunk München - Landkreis Fürstenfeldbruck (FFB)'
-  site_code = 'ffbay_ffb',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = 'ae860ed0953464e4412623ae48061f6a619ce7cbe64246d8100578c5a74028a1',
+
   prefix4 = '10.80.232.0/21',
   prefix6 = 'fdef:ffc0:4fff:1d::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-umland-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -105,48 +100,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
-    },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
   },
 
 }

domains/ffbay_fs.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Landkreis Freising (FS)',
+    ffbay_fs = 'Freifunk München - Landkreis Freising (FS)'
-  site_code = 'ffbay_fs',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '022cb1bed51c6218c6ab94c1d1481625c83ffecad94e59481234e8ff59c9e513',
+
   prefix4 = '10.80.224.0/21',
   prefix6 = 'fdef:ffc0:4fff:1f::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-umland-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -105,49 +100,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffbay_sta.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Landkreis Starnberg (STA)',
+    ffbay_sta = 'Freifunk München - Landkreis Starnberg (STA)'
-  site_code = 'ffbay_sta',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '4e9804e7492798ae61b03e400fcd2d08cc185241a3f69399ff2f038b1724ddbf',
+
   prefix4 = '10.80.0.0/21',
   prefix6 = 'fdef:ffc0:4fff:1c::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-umland-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -105,49 +100,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffbay_tol.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Landkreis Bad Tölz-Wolfratshausen (TÖL)',
+    ffbay_tol = 'Freifunk München - Landkreis Bad Tölz-Wolfratshausen (TÖL)'
-  site_code = 'ffbay_tol',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '8f741d9763d0e0c0a7e80f99a7a3d4a8bd71a43238db7d89b7722ccb69c1ba88',
+
   prefix4 = '10.80.8.0/21',
   prefix6 = 'fdef:ffc0:4fff:22::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-umland-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -105,49 +100,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München [ALT]',
+    ffmuc = 'Freifunk München [ALT]'
-  site_code = 'ffmuc',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = 'a4eda400cdbc351fb139da7e3c9242aefffdfa566320d429fe596f41a60e3ba4',
+
   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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -54,6 +49,7 @@
   },
 
   mesh = {
+    vxlan = false, -- legacy support
     batman_adv = {
       gw_sel_class = 3,
     },
@@ -112,49 +108,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc01.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Altstadt-Lehel',
+    ffmuc01 = 'Freifunk München - Altstadt-Lehel'
-  site_code = 'ffmuc01',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '1e38d844ba2ebe5aa1b619dd786426476019387f548759606429db0aebc6e354',
+
   prefix4 = '10.80.132.0/22',
   prefix6 = 'fdef:ffc0:4fff:3::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc02.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Ludwigsvorstadt-Isarvorstadt',
+    ffmuc02 = 'Freifunk München - Ludwigsvorstadt-Isarvorstadt'
-  site_code = 'ffmuc02',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '7a6b67f274ee6fd0c0a0972906391e94792f9c73c1bb9a2adcb633838720c680',
+
   prefix4 = '10.80.164.0/22',
   prefix6 = 'fdef:ffc0:4fff:4::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc03.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Maxvorstadt',
+    ffmuc03 = 'Freifunk München - Maxvorstadt'
-  site_code = 'ffmuc03',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '708de6e9983ddcda67a7d38c1dbbc66032b96adbc6b302b6df9e6974a8eac2d7',
+
   prefix4 = '10.80.168.0/22',
   prefix6 = 'fdef:ffc0:4fff:5::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc04.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Schwabing-West',
+    ffmuc04 = 'Freifunk München - Schwabing-West'
-  site_code = 'ffmuc04',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = 'b9f15c36c59dcb57d5b05424199dbe8e5f37084a8c0b401448616c65ac06c790',
+
   prefix4 = '10.80.200.0/22',
   prefix6 = 'fdef:ffc0:4fff:6::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc05.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Au-Haidhausen',
+    ffmuc05 = 'Freifunk München - Au-Haidhausen'
-  site_code = 'ffmuc05',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = 'ce7da86ff25fcbf06ddc5840b7c396b0c95fa868265cd987a0e5bc89ea5978eb',
+
   prefix4 = '10.80.136.0/22',
   prefix6 = 'fdef:ffc0:4fff:7::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc06.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Sendling',
+    ffmuc06 = 'Freifunk München - Sendling'
-  site_code = 'ffmuc06',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '439cc38e42efdd097c39ba3ec5a805cca27a59a0b68379524ee454d1bc6bd092',
+
   prefix4 = '10.80.212.0/22',
   prefix6 = 'fdef:ffc0:4fff:8::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc07.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Sendling-Westpark',
+    ffmuc07 = 'Freifunk München - Sendling-Westpark'
-  site_code = 'ffmuc07',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '0630935640caac0cc22e7599ad86b0bf5ecdd94918c38fcbf44e1ae750c68e6f',
+
   prefix4 = '10.80.208.0/22',
   prefix6 = 'fdef:ffc0:4fff:9::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc08.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Schwanthalerhöhe',
+    ffmuc08 = 'Freifunk München - Schwanthalerhöhe'
-  site_code = 'ffmuc08',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '22b514c990c0ab4b4bb4123309348ecec136aeca0c4045f2bd6ff37a8b663463',
+
   prefix4 = '10.80.204.0/22',
   prefix6 = 'fdef:ffc0:4fff:a::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc09.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Neuhausen-Nymphenburg',
+    ffmuc09 = 'Freifunk München - Neuhausen-Nymphenburg'
-  site_code = 'ffmuc09',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = 'bc6f7190d8b2541aface536b2e4a22fe0f6912a9a8b5da6450238b388803e789',
+
   prefix4 = '10.80.180.0/22',
   prefix6 = 'fdef:ffc0:4fff:b::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc10.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Moosach',
+    ffmuc10 = 'Freifunk München - Moosach'
-  site_code = 'ffmuc10',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '289a757f8d02ed62ea23b05aa2e67c56d49378d135fe73c7500c4134242e4b55',
+
   prefix4 = '10.80.176.0/22',
   prefix6 = 'fdef:ffc0:4fff:c::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc11.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Milbertshofen-Am-Hart',
+    ffmuc11 = 'Freifunk München - Milbertshofen-Am-Hart'
-  site_code = 'ffmuc11',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '33881e20e3d44e39f38b5cdfc210e32fd59c3654792cfeb759f09a3e82752228',
+
   prefix4 = '10.80.172.0/22',
   prefix6 = 'fdef:ffc0:4fff:d::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc12.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Schwabing-Freimann',
+    ffmuc12 = 'Freifunk München - Schwabing-Freimann'
-  site_code = 'ffmuc12',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '05fca4c54c9c922718fa4aafb97b8b77f61e1a886cfd7ca6ffd0a595ffc1e558',
+
   prefix4 = '10.80.196.0/22',
   prefix6 = 'fdef:ffc0:4fff:e::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc13.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Bogenhausen',
+    ffmuc13 = 'Freifunk München - Bogenhausen'
-  site_code = 'ffmuc13',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '55010e14573d89b104e59de3c160a04de51e3af6cd35700d8c82f946729c876b',
+
   prefix4 = '10.80.148.0/22',
   prefix6 = 'fdef:ffc0:4fff:f::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc14.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Berg am Laim',
+    ffmuc14 = 'Freifunk München - Berg am Laim'
-  site_code = 'ffmuc14',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '7f352cd2fe36b3e758383ce8fdbff878268ced7ff1c7457eaf777b368d6856c3',
+
   prefix4 = '10.80.144.0/22',
   prefix6 = 'fdef:ffc0:4fff:10::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc15.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Trudering-Riem',
+    ffmuc15 = 'Freifunk München - Trudering-Riem'
-  site_code = 'ffmuc15',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '56984392d5a4d94642348173679ea7ef1de35a5a8d5e3e799fc4f742ae6c8b83',
+
   prefix4 = '10.80.220.0/22',
   prefix6 = 'fdef:ffc0:4fff:11::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc16.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Ramersdorf-Perlach',
+    ffmuc16 = 'Freifunk München - Ramersdorf-Perlach'
-  site_code = 'ffmuc16',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = 'deb4f653140eed3ecf02888b6e37570a29559a761be9fd27479e6314d66e6c60',
+
   prefix4 = '10.80.192.0/22',
   prefix6 = 'fdef:ffc0:4fff:12::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc17.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Giesing',
+    ffmuc17 = 'Freifunk München - Giesing'
-  site_code = 'ffmuc17',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '77f48920396a377152ea280c7d2ac6036c0357bb2a15dc6c2af2763b20aa5fa9',
+
   prefix4 = '10.80.184.0/22',
   prefix6 = 'fdef:ffc0:4fff:13::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc19.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Thalkirchen-Obersendling-Forstenried-Fürstenried-Solln',
+    ffmuc19 = 'Freifunk München - Thalkirchen-Obersendling-Forstenried-Fürstenried-Solln'
-  site_code = 'ffmuc19',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '8da3f1be19f86bee2c8eb67da76389a175c0d17eb8a5955205dc66d1a4539c89',
+
   prefix4 = '10.80.216.0/22',
   prefix6 = 'fdef:ffc0:4fff:14::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc20.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Hadern',
+    ffmuc20 = 'Freifunk München - Hadern'
-  site_code = 'ffmuc20',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '872e43ff8980a6cf6c3f1961b0d75f7cc9ec771e9744870d268787052fd1012b',
+
   prefix4 = '10.80.156.0/22',
   prefix6 = 'fdef:ffc0:4fff:15::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc21.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Pasing-Obermenzing',
+    ffmuc21 = 'Freifunk München - Pasing-Obermenzing'
-  site_code = 'ffmuc21',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '84d419be7358ed420a099077ab93a0c6e758cc3d8ac1f4aea43eb1b32dd910f6',
+
   prefix4 = '10.80.188.0/22',
   prefix6 = 'fdef:ffc0:4fff:16::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc22.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Aubing-Lochhausen-Langwied',
+    ffmuc22 = 'Freifunk München - Aubing-Lochhausen-Langwied'
-  site_code = 'ffmuc22',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '08fdc1822d39ed392fc39d3d288fba05ca06080378011e75b88e56cc701d02ff',
+
   prefix4 = '10.80.140.0/22',
   prefix6 = 'fdef:ffc0:4fff:17::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc23.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Allach-Untermenzing',
+    ffmuc23 = 'Freifunk München - Allach-Untermenzing'
-  site_code = 'ffmuc23',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '2b46dad9cee72c4ee9fe94b38ceaeb995c9a3e783223360cc2cb79c82eca469c',
+
   prefix4 = '10.80.128.0/22',
   prefix6 = 'fdef:ffc0:4fff:18::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc24.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Feldmoching-Hasenbergl',
+    ffmuc24 = 'Freifunk München - Feldmoching-Hasenbergl'
-  site_code = 'ffmuc24',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = 'eca82a3a6c04b0cbd459e1839a2bea43660168d0dfdbdd746d14676d49af73b5',
+
   prefix4 = '10.80.152.0/22',
   prefix6 = 'fdef:ffc0:4fff:19::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc25.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - Laim',
+    ffmuc25 = 'Freifunk München - Laim'
-  site_code = 'ffmuc25',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = 'bbc49d35f05b72b5ebaa709e0761881dbcd7cdfd3183d604757f64d4e48aa8a5',
+
   prefix4 = '10.80.160.0/22',
   prefix6 = 'fdef:ffc0:4fff:1a::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc_land.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München - München-Land',
+    ffmuc_land = 'Freifunk München - München-Land'
-  site_code = 'ffmuc_land',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = 'd6aecdc385737430aa9fd65f3f632756e8da75dbe45c5d30fc07d9afb0832dab',
+
   prefix4 = '10.80.24.0/21',
   prefix6 = 'fdef:ffc0:4fff:1b::/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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc',
       bssid = '02:0E:8E:1E:61:17',
@@ -112,49 +107,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc_umland.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = '',
+  domain_names = {
-  site_name = 'Freifunk München Umland [ALT]',
+    ffmuc_umland = 'Freifunk München Umland [ALT]'
-  site_code = 'ffmuc_umland',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = 'c88cf5e6bd3d289d7fa1aa67f606116d48b8d7848af6a3216adfe7592f68aaea',
+
   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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-umland-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.umland',
       bssid = '02:0E:8E:1E:61:19',
@@ -54,6 +49,7 @@
   },
 
   mesh = {
+    vxlan = false, -- legacy support
     batman_adv = {
       gw_sel_class = 3,
     },
@@ -105,49 +101,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

domains/ffmuc_welcome.conf

@@ -1,7 +1,7 @@
 {
-  hostname_prefix = 'welcome',
+  domain_names = {
-  site_name = 'Freifunk München Welcome',
+    ffmuc_welcome = 'Freifunk München Welcome'
-  site_code = 'ffmuc_welcome',
+  },
 
   opkg = {
     extra = {
@@ -9,27 +9,21 @@
     },
   },
 
+  domain_seed = '7c147ed35137c0ebf6460b593b0e3fed347759606be68c46ebacebce1364c142',
+
   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 = {
     channel = 6,
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-    basic_rate = {6000, 9000, 18000, 36000, 54000},
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-welcome-mesh',
+      id = 'ffmuc-welcome-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.welcome',
       bssid = '02:0E:8E:1E:61:18',
@@ -42,10 +36,11 @@
     ap = {
       ssid = 'muenchen.freifunk.net',
     },
-    --mesh = {
+    mesh = {
-    --  id = 'ffmuc-welcome-mesh',
+      id = 'ffmuc-welcome-mesh',
-    --  mcast_rate = 12000,
+      mcast_rate = 12000,
-    --},
+      disabled = true,
+    },
     ibss = {
       ssid = 'mesh.ffmuc.welcome',
       bssid = '02:0E:8E:1E:61:18',
@@ -54,6 +49,7 @@
   },
 
   mesh = {
+    vxlan = false, -- legacy support
     batman_adv = {
       gw_sel_class = 3,
     },
@@ -105,49 +101,6 @@
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
   },
-  },
-
-  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 = 3,
-        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)
-        },
-      },
-    },
-  },
-
 }
 -- vim: set ft=lua:ts=2:sw=2:et

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: 2015-05-16 19:31+0200\n"
+"PO-Revision-Date: 2018-08-01 19:31+0200\n"
-"Last-Translator: Franz Pletz <fpletz@fnordicwalking.de>\n"
+"Last-Translator: Matthias Kesler <krombel@krombel.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -16,17 +16,28 @@ 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 startet gerade neu und wird anschließend versuchen, sich "
+"<p>Dein Knoten <em><%= pcdata(hostname) %></em> startet gerade neu und wird "
-"mit anderen Freifunk-Knoten in seiner Nähe zu verbinden. Weitere "
+"anschließend versuchen, sich mit anderen Freifunk-Knoten in seiner Nähe zu "
-"Informationen zur Münchner Freifunk-Community findest du auf "
+"verbinden. Weitere Informationen zur "
-"<a href=\"https://ffmuc.net/\">unserer Webseite</a>. Wenn "
+"Münchner Freifunk-Community findest du auf "
-"alles geklappt hat, wirst du in ein paar Minuten unter "
+"<a href=\"https://ffmuc.net/\">unserer Webseite</a>.</p>"
+"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 "
@@ -40,3 +51,29 @@ 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 ""

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: 2015-05-16 19:31+0200\n"
+"PO-Revision-Date: 2018-08-01 19:31+0200\n"
-"Last-Translator: Franz Pletz <fpletz@fnordicwalking.de>\n"
+"Last-Translator: Matthias Kesler <krombel@krombel.de>\n"
 "Language-Team: English\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
@@ -12,20 +12,64 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Welcome the the setup wizard of your new Freifunk Munich node. "
+"Welcome to the setup wizard of your new Freifunk Munich node. "
-"Please fill out the following form and transmit it."
+"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"
 
 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 is currently rebooting and will try to connect to other "
+"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
-"nearby Freifunk nodes. It should appear on our map at "
+"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 "
 "<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 the Freifunk network!</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 ""

i18n/fr.po

@@ -0,0 +1,70 @@
+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 ""

i18n/gluon-site.pot

@@ -0,0 +1,38 @@
+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 ""

modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffmuc'
 
 PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git
 PACKAGES_FFMUC_BRANCH=master
-PACKAGES_FFMUC_COMMIT=5632eaba747ac356b68f5d40f30233eafc785975
+PACKAGES_FFMUC_COMMIT=bfbbaa0b9fba5ff1bf8cda945f6c1e757f038c05

site.conf

@@ -1,7 +1,8 @@
 {
-  hostname_prefix = '',
+  hostname_prefix = 'ffmuc-',
-  site_name = 'Freifunk München [ALT]',
+  site_name = 'Freifunk München',
   site_code = 'ffmuc',
+  default_domain = 'ffmuc',
 
   opkg = {
     extra = {
@@ -9,9 +10,6 @@
     },
   },
 
-  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' },
 
@@ -23,32 +21,20 @@
     channel = 6,
     supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
     basic_rate = {6000, 9000, 18000, 36000, 54000},
-    ap = {
+    mesh = {
-      ssid = 'muenchen.freifunk.net',
+      mcast_rate = 12000,
     },
-    --mesh = {
-    --  id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
-    --},
     ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
       mcast_rate = 12000,
     },
   },
 
   wifi5 = {
     channel = 44,
-    ap = {
+    mesh = {
-      ssid = 'muenchen.freifunk.net',
+      mcast_rate = 12000,
     },
-    --mesh = {
-    --  id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
-    --},
     ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
       mcast_rate = 12000,
     },
   },
@@ -59,59 +45,7 @@
     },
   },
 
-  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',
-              },
-            },
-          },
-        },
-      },
-    },
     bandwidth_limit = {
       enabled = false,
       egress = 1500,
@@ -132,6 +66,7 @@
         probability = 0.1,
         good_signatures = 3,
         pubkeys = {
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -147,6 +82,7 @@
         probability = 0.5,
         good_signatures = 2,
         pubkeys = {
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris

site.mk

@@ -1,29 +1,27 @@
+GLUON_MULTIDOMAIN=1
+
+GLUON_FEATURES := \
+	respondd \
+	autoupdater \
+	web-wizard \
+	ebtables-limit-arp \
+	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 \
+	domain-migration-ffmuc
+
 GLUON_SITE_PACKAGES := \
-	gluon-respondd \
-	gluon-autoupdater \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-contact-info \
-	gluon-config-mode-core \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	gluon-web-admin \
-	gluon-web-autoupdater \
-	gluon-web-network \
-	gluon-web-wifi-config \
-	gluon-mesh-batman-adv-15 \
-	gluon-mesh-vpn-fastd \
-	gluon-radvd \
-	gluon-setup-mode \
-	gluon-status-page \
 	iwinfo \
 	iptables \
 	haveged \
-	gluon-config-mode-site-select \
-	gluon-ebtables-filter-arp-ffmuc \
-	gluon-ebtables-filter-multicast-ffmuc \
 	tecff-ath9k-broken-wifi-workaround \
 	tecff-respondd-watchdog
 
@@ -168,12 +166,15 @@ GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_P
 
 DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')
 
+# default to ibss meshing (legacy)
+GLUON_WLAN_MESH = ibss
+
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 
 GLUON_PRIORITY ?= 0
 
+GLUON_REGION ?= eu
+
 # Languages to include
 GLUON_LANGS ?= en de
-
-GLUON_REGION := eu