From 36edcdabac58e2c31728de6573cc2e4dee33a641 Mon Sep 17 00:00:00 2001 From: Krombel Date: Wed, 1 Aug 2018 20:07:46 +0200 Subject: [PATCH 01/17] update to v2018.1 (see details) - 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 | 14 +++++++++ Makefile | 2 +- i18n/de.po | 51 ++++++++++++++++++++++++++++----- i18n/en.po | 58 ++++++++++++++++++++++++++++++++----- i18n/fr.po | 70 +++++++++++++++++++++++++++++++++++++++++++++ i18n/gluon-site.pot | 38 ++++++++++++++++++++++++ site.conf | 6 +++- site.mk | 45 ++++++++++++++--------------- 8 files changed, 244 insertions(+), 40 deletions(-) create mode 100644 i18n/fr.po create mode 100644 i18n/gluon-site.pot diff --git a/CHANGELOG.md b/CHANGELOG.md index 43b81c0..7873ef4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Freifunk München Firmware Changelog +## v2018.1 + - Updated to Gluon v2018.1 + - Changes: + - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.html + - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.1.html + - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.2.html + - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.3.html + - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.4.html + - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.5.html + - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.6.html + - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.7.html + - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.8.html + - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2018.1.html + ## v2017.1 - Updated to Gluon v2016.2.7 diff --git a/Makefile b/Makefile index 712e45c..d6938c4 100644 --- a/Makefile +++ b/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.1 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key diff --git a/i18n/de.po b/i18n/de.po index 8d73f6f..73381f4 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2015-05-16 19:31+0200\n" -"Last-Translator: Franz Pletz \n" +"PO-Revision-Date: 2018-08-01 19:31+0200\n" +"Last-Translator: Matthias Kesler \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 "" -"

Dein Knoten startet gerade neu und wird anschließend versuchen, sich " -"mit anderen Freifunk-Knoten in seiner Nähe zu verbinden. Weitere " -"Informationen zur Münchner Freifunk-Community findest du auf " -"unserer Webseite. Wenn " -"alles geklappt hat, wirst du in ein paar Minuten unter " +"

Dein Knoten <%= pcdata(hostname) %> startet gerade neu und wird " +"anschließend versuchen, sich mit anderen Freifunk-Knoten in seiner Nähe zu " +"verbinden. Weitere Informationen zur " +"Münchner Freifunk-Community findest du auf " +"unserer Webseite.

" +"Wenn alles geklappt hat, wirst du in ein paar Minuten unter " "ffmuc.net/map/ " "deinen Knoten finden.

" "

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.

" "

Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!

" + +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 "" diff --git a/i18n/en.po b/i18n/en.po index a974a3a..6057460 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2015-05-16 19:31+0200\n" -"Last-Translator: Franz Pletz \n" +"PO-Revision-Date: 2018-08-01 19:31+0200\n" +"Last-Translator: Matthias Kesler \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. " -"Please fill out the following form and transmit it." +"Welcome to the setup wizard of your new Freifunk Munich node. " +"Please fill out the following form and submit it." + +msgid "gluon-config-mode:domain" +msgstr "Domain" + +msgid "gluon-config-mode:domain-select" +msgstr "" +"Here you have the possibility of selecting the mesh domain in which your node " +"is placed. Please keep in mind that your router only connects with the nodes " +"of the selected domain" msgid "gluon-config-mode:pubkey" msgstr "" " " +msgid "gluon-config-mode:novpn" +msgstr "" +"

You have selected not 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.

" + msgid "gluon-config-mode:reboot" msgstr "" -"

Your node is currently rebooting and will try to connect to other " -"nearby Freifunk nodes. It should appear on our map at " +"

Your node <%= pcdata(hostname) %> is currently rebooting and will " +"try to connect to other nearby Freifunk nodes after that. For more " +"information about the Freifunk community in Munich, have a look at " +"our homepage.

" +"Your node should appear on our map at " "ffmuc.net/map/ " "in a few minutes.

" "

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.

" -"

Have fun with your node and exploring the Freifunk network!

" +"

Have fun with your node and exploring of the Freifunk network!

" + +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 "" diff --git a/i18n/fr.po b/i18n/fr.po new file mode 100644 index 0000000..991f133 --- /dev/null +++ b/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 \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 "" +"

Vous avez choisi de ne pas utiliser " +"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.

" + +msgid "gluon-config-mode:reboot" +msgstr "" +"

Votre nœud <%= pcdata(hostname) %> 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 " +" de ton groupe .

" +"

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.

" +"

Profitez votre de nœud et amusez vous à découvrir le réseau Freifunk!

" + +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 "" diff --git a/i18n/gluon-site.pot b/i18n/gluon-site.pot new file mode 100644 index 0000000..032c693 --- /dev/null +++ b/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 "" diff --git a/site.conf b/site.conf index 51b8939..387ede7 100644 --- a/site.conf +++ b/site.conf @@ -1,5 +1,5 @@ { - hostname_prefix = '', + hostname_prefix = 'ffmuc-', site_name = 'Freifunk München [ALT]', site_code = 'ffmuc', @@ -9,6 +9,10 @@ }, }, + -- 32 bytes of random data, encoded in hexadecimal + -- This data must be unique among all sites and domains! + domain_seed = '8f6cb3915d9cff8e556a88ee9326349b23a251e056465afbd9f5e5c01c86c7c7', + prefix4 = '10.80.32.0/19', prefix6 = 'fdef:ffc0:4fff::/64', diff --git a/site.mk b/site.mk index fb325ad..1e9faf9 100644 --- a/site.mk +++ b/site.mk @@ -1,29 +1,26 @@ +GLUON_FEATURES := \ + respondd \ + autoupdater \ + web-wizard \ + ebtables-filter-multicast \ + ebtables-filter-ra-dhcp \ + web-admin \ + web-autoupdater \ + web-network \ + web-wifi-config \ + mesh-batman-adv-15 \ + mesh-vpn-fastd \ + radvd \ + setup-mode \ + status-page \ + config-mode-site-select \ + ebtables-filter-arp-ffmuc \ + ebtables-filter-multicast-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 @@ -173,7 +170,7 @@ GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_PRIORITY ?= 0 +GLUON_REGION ?= eu + # Languages to include GLUON_LANGS ?= en de - -GLUON_REGION := eu -- 2.39.5 From 7f7a1b87107aa17294eff905c73850fc53cc8657 Mon Sep 17 00:00:00 2001 From: Krombel Date: Wed, 1 Aug 2018 23:34:16 +0200 Subject: [PATCH 02/17] exchange site-config by multidomain-config --- {extra => domains}/ffbay_dah.conf | 78 +++++-------------------- {extra => domains}/ffbay_ebe.conf | 78 +++++-------------------- {extra => domains}/ffbay_ed.conf | 78 +++++-------------------- {extra => domains}/ffbay_ffb.conf | 77 +++++-------------------- {extra => domains}/ffbay_fs.conf | 78 +++++-------------------- {extra => domains}/ffbay_sta.conf | 78 +++++-------------------- {extra => domains}/ffbay_tol.conf | 78 +++++-------------------- {extra => domains}/ffmuc.conf | 78 +++++-------------------- {extra => domains}/ffmuc01.conf | 82 ++++++--------------------- {extra => domains}/ffmuc02.conf | 82 ++++++--------------------- {extra => domains}/ffmuc03.conf | 82 ++++++--------------------- {extra => domains}/ffmuc04.conf | 82 ++++++--------------------- {extra => domains}/ffmuc05.conf | 78 +++++-------------------- {extra => domains}/ffmuc06.conf | 78 +++++-------------------- {extra => domains}/ffmuc07.conf | 78 +++++-------------------- {extra => domains}/ffmuc08.conf | 78 +++++-------------------- {extra => domains}/ffmuc09.conf | 78 +++++-------------------- {extra => domains}/ffmuc10.conf | 78 +++++-------------------- {extra => domains}/ffmuc11.conf | 78 +++++-------------------- {extra => domains}/ffmuc12.conf | 78 +++++-------------------- {extra => domains}/ffmuc13.conf | 78 +++++-------------------- {extra => domains}/ffmuc14.conf | 78 +++++-------------------- {extra => domains}/ffmuc15.conf | 78 +++++-------------------- {extra => domains}/ffmuc16.conf | 78 +++++-------------------- {extra => domains}/ffmuc17.conf | 78 +++++-------------------- {extra => domains}/ffmuc19.conf | 78 +++++-------------------- {extra => domains}/ffmuc20.conf | 78 +++++-------------------- {extra => domains}/ffmuc21.conf | 78 +++++-------------------- {extra => domains}/ffmuc22.conf | 78 +++++-------------------- {extra => domains}/ffmuc23.conf | 78 +++++-------------------- {extra => domains}/ffmuc24.conf | 78 +++++-------------------- {extra => domains}/ffmuc25.conf | 78 +++++-------------------- {extra => domains}/ffmuc_land.conf | 78 +++++-------------------- {extra => domains}/ffmuc_umland.conf | 78 +++++-------------------- {extra => domains}/ffmuc_welcome.conf | 78 +++++-------------------- site.conf | 82 ++------------------------- site.mk | 8 ++- 37 files changed, 544 insertions(+), 2291 deletions(-) rename {extra => domains}/ffbay_dah.conf (50%) rename {extra => domains}/ffbay_ebe.conf (50%) rename {extra => domains}/ffbay_ed.conf (50%) rename {extra => domains}/ffbay_ffb.conf (50%) rename {extra => domains}/ffbay_fs.conf (50%) rename {extra => domains}/ffbay_sta.conf (50%) rename {extra => domains}/ffbay_tol.conf (50%) rename {extra => domains}/ffmuc.conf (53%) rename {extra => domains}/ffmuc01.conf (52%) rename {extra => domains}/ffmuc02.conf (52%) rename {extra => domains}/ffmuc03.conf (52%) rename {extra => domains}/ffmuc04.conf (52%) rename {extra => domains}/ffmuc05.conf (53%) rename {extra => domains}/ffmuc06.conf (53%) rename {extra => domains}/ffmuc07.conf (53%) rename {extra => domains}/ffmuc08.conf (53%) rename {extra => domains}/ffmuc09.conf (53%) rename {extra => domains}/ffmuc10.conf (53%) rename {extra => domains}/ffmuc11.conf (53%) rename {extra => domains}/ffmuc12.conf (53%) rename {extra => domains}/ffmuc13.conf (53%) rename {extra => domains}/ffmuc14.conf (53%) rename {extra => domains}/ffmuc15.conf (53%) rename {extra => domains}/ffmuc16.conf (53%) rename {extra => domains}/ffmuc17.conf (53%) rename {extra => domains}/ffmuc19.conf (53%) rename {extra => domains}/ffmuc20.conf (53%) rename {extra => domains}/ffmuc21.conf (53%) rename {extra => domains}/ffmuc22.conf (53%) rename {extra => domains}/ffmuc23.conf (53%) rename {extra => domains}/ffmuc24.conf (53%) rename {extra => domains}/ffmuc25.conf (53%) rename {extra => domains}/ffmuc_land.conf (53%) rename {extra => domains}/ffmuc_umland.conf (50%) rename {extra => domains}/ffmuc_welcome.conf (50%) diff --git a/extra/ffbay_dah.conf b/domains/ffbay_dah.conf similarity index 50% rename from extra/ffbay_dah.conf rename to domains/ffbay_dah.conf index db09ef0..a30f857 100644 --- a/extra/ffbay_dah.conf +++ b/domains/ffbay_dah.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Landkreis Dachau (DAH)', - site_code = 'ffbay_dah', + domain_names = { + ffbay_dah = 'Freifunk München - Landkreis Dachau (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 = { - -- id = 'ffmuc-umland-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-umland-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffbay_ebe.conf b/domains/ffbay_ebe.conf similarity index 50% rename from extra/ffbay_ebe.conf rename to domains/ffbay_ebe.conf index af0830d..6795480 100644 --- a/extra/ffbay_ebe.conf +++ b/domains/ffbay_ebe.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Landkreis Ebersberg (EBE)', - site_code = 'ffbay_ebe', + domain_names = { + ffbay_ebe = 'Freifunk München - Landkreis Ebersberg (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 = { - -- id = 'ffmuc-umland-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-umland-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffbay_ed.conf b/domains/ffbay_ed.conf similarity index 50% rename from extra/ffbay_ed.conf rename to domains/ffbay_ed.conf index 5ad39ed..0b15ffc 100644 --- a/extra/ffbay_ed.conf +++ b/domains/ffbay_ed.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Landkreis Erding (ED)', - site_code = 'ffbay_ed', + domain_names = { + ffbay_ed = 'Freifunk München - Landkreis Erding (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 = { - -- id = 'ffmuc-umland-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-umland-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffbay_ffb.conf b/domains/ffbay_ffb.conf similarity index 50% rename from extra/ffbay_ffb.conf rename to domains/ffbay_ffb.conf index 87c0786..bd1ab3c 100644 --- a/extra/ffbay_ffb.conf +++ b/domains/ffbay_ffb.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Landkreis Fürstenfeldbruck (FFB)', - site_code = 'ffbay_ffb', + domain_names = { + ffbay_ffb = 'Freifunk München - Landkreis Fürstenfeldbruck (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 = { - -- id = 'ffmuc-umland-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-umland-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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) - }, - }, - }, }, } diff --git a/extra/ffbay_fs.conf b/domains/ffbay_fs.conf similarity index 50% rename from extra/ffbay_fs.conf rename to domains/ffbay_fs.conf index f5c1c92..db85c64 100644 --- a/extra/ffbay_fs.conf +++ b/domains/ffbay_fs.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Landkreis Freising (FS)', - site_code = 'ffbay_fs', + domain_names = { + ffbay_fs = 'Freifunk München - Landkreis Freising (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 = { - -- id = 'ffmuc-umland-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-umland-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffbay_sta.conf b/domains/ffbay_sta.conf similarity index 50% rename from extra/ffbay_sta.conf rename to domains/ffbay_sta.conf index 5cd5bab..bb8a645 100644 --- a/extra/ffbay_sta.conf +++ b/domains/ffbay_sta.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Landkreis Starnberg (STA)', - site_code = 'ffbay_sta', + domain_names = { + ffbay_sta = 'Freifunk München - Landkreis Starnberg (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 = { - -- id = 'ffmuc-umland-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-umland-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffbay_tol.conf b/domains/ffbay_tol.conf similarity index 50% rename from extra/ffbay_tol.conf rename to domains/ffbay_tol.conf index 535730a..36b4118 100644 --- a/extra/ffbay_tol.conf +++ b/domains/ffbay_tol.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Landkreis Bad Tölz-Wolfratshausen (TÖL)', - site_code = 'ffbay_tol', + domain_names = { + ffbay_tol = 'Freifunk München - Landkreis Bad Tölz-Wolfratshausen (TÖL)' + }, 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 = { - -- id = 'ffmuc-umland-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-umland-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc.conf b/domains/ffmuc.conf similarity index 53% rename from extra/ffmuc.conf rename to domains/ffmuc.conf index 51b8939..3ceb31d 100644 --- a/extra/ffmuc.conf +++ b/domains/ffmuc.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München [ALT]', - site_code = 'ffmuc', + domain_names = { + ffmuc = 'Freifunk München [ALT]' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc01.conf b/domains/ffmuc01.conf similarity index 52% rename from extra/ffmuc01.conf rename to domains/ffmuc01.conf index c96dbd8..1f94e99 100644 --- a/extra/ffmuc01.conf +++ b/domains/ffmuc01.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Altstadt-Lehel', - site_code = 'ffmuc01', + domain_names = { + ffmuc01 = 'Freifunk München - Altstadt-Lehel' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + mcast_rate = 12000, + disabled = true, + }, ibss = { ssid = 'mesh.ffmuc', bssid = '02:0E:8E:1E:61:17', @@ -60,8 +55,8 @@ }, next_node = { - ip4 = '10.80.132.1', - ip6 = 'fdef:ffc0:4fff:3::1', + ip4 = '10.80.132.1', + ip6 = 'fdef:ffc0:4fff:3::1', mac = '16:41:95:40:f7:dc', }, @@ -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 diff --git a/extra/ffmuc02.conf b/domains/ffmuc02.conf similarity index 52% rename from extra/ffmuc02.conf rename to domains/ffmuc02.conf index 3d3ff06..f02fda5 100644 --- a/extra/ffmuc02.conf +++ b/domains/ffmuc02.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Ludwigsvorstadt-Isarvorstadt', - site_code = 'ffmuc02', + domain_names = { + ffmuc02 = 'Freifunk München - Ludwigsvorstadt-Isarvorstadt' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + mcast_rate = 12000, + disabled = true, + }, ibss = { ssid = 'mesh.ffmuc', bssid = '02:0E:8E:1E:61:17', @@ -60,8 +55,8 @@ }, next_node = { - ip4 = '10.80.164.1', - ip6 = 'fdef:ffc0:4fff:4::1', + ip4 = '10.80.164.1', + ip6 = 'fdef:ffc0:4fff:4::1', mac = '16:41:95:40:f7:dc', }, @@ -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 diff --git a/extra/ffmuc03.conf b/domains/ffmuc03.conf similarity index 52% rename from extra/ffmuc03.conf rename to domains/ffmuc03.conf index 3598c83..34269fe 100644 --- a/extra/ffmuc03.conf +++ b/domains/ffmuc03.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Maxvorstadt', - site_code = 'ffmuc03', + domain_names = { + ffmuc03 = 'Freifunk München - Maxvorstadt' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + mcast_rate = 12000, + disabled = true, + }, ibss = { ssid = 'mesh.ffmuc', bssid = '02:0E:8E:1E:61:17', @@ -60,8 +55,8 @@ }, next_node = { - ip4 = '10.80.168.1', - ip6 = 'fdef:ffc0:4fff:5::1', + ip4 = '10.80.168.1', + ip6 = 'fdef:ffc0:4fff:5::1', mac = '16:41:95:40:f7:dc', }, @@ -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 diff --git a/extra/ffmuc04.conf b/domains/ffmuc04.conf similarity index 52% rename from extra/ffmuc04.conf rename to domains/ffmuc04.conf index 5520652..ca1fd9d 100644 --- a/extra/ffmuc04.conf +++ b/domains/ffmuc04.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Schwabing-West', - site_code = 'ffmuc04', + domain_names = { + ffmuc04 = 'Freifunk München - Schwabing-West' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + mcast_rate = 12000, + disabled = true, + }, ibss = { ssid = 'mesh.ffmuc', bssid = '02:0E:8E:1E:61:17', @@ -60,8 +55,8 @@ }, next_node = { - ip4 = '10.80.200.1', - ip6 = 'fdef:ffc0:4fff:6::1', + ip4 = '10.80.200.1', + ip6 = 'fdef:ffc0:4fff:6::1', mac = '16:41:95:40:f7:dc', }, @@ -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 diff --git a/extra/ffmuc05.conf b/domains/ffmuc05.conf similarity index 53% rename from extra/ffmuc05.conf rename to domains/ffmuc05.conf index fcebebe..20d4a18 100644 --- a/extra/ffmuc05.conf +++ b/domains/ffmuc05.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Au-Haidhausen', - site_code = 'ffmuc05', + domain_names = { + ffmuc05 = 'Freifunk München - Au-Haidhausen' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc06.conf b/domains/ffmuc06.conf similarity index 53% rename from extra/ffmuc06.conf rename to domains/ffmuc06.conf index 9d5c7b8..c4c52b0 100644 --- a/extra/ffmuc06.conf +++ b/domains/ffmuc06.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Sendling', - site_code = 'ffmuc06', + domain_names = { + ffmuc06 = 'Freifunk München - Sendling' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc07.conf b/domains/ffmuc07.conf similarity index 53% rename from extra/ffmuc07.conf rename to domains/ffmuc07.conf index e0a7685..74b5697 100644 --- a/extra/ffmuc07.conf +++ b/domains/ffmuc07.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Sendling-Westpark', - site_code = 'ffmuc07', + domain_names = { + ffmuc07 = 'Freifunk München - Sendling-Westpark' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc08.conf b/domains/ffmuc08.conf similarity index 53% rename from extra/ffmuc08.conf rename to domains/ffmuc08.conf index 419e3d0..f2a69a0 100644 --- a/extra/ffmuc08.conf +++ b/domains/ffmuc08.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Schwanthalerhöhe', - site_code = 'ffmuc08', + domain_names = { + ffmuc08 = 'Freifunk München - Schwanthalerhöhe' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc09.conf b/domains/ffmuc09.conf similarity index 53% rename from extra/ffmuc09.conf rename to domains/ffmuc09.conf index fc24bf2..3b6983f 100644 --- a/extra/ffmuc09.conf +++ b/domains/ffmuc09.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Neuhausen-Nymphenburg', - site_code = 'ffmuc09', + domain_names = { + ffmuc09 = 'Freifunk München - Neuhausen-Nymphenburg' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc10.conf b/domains/ffmuc10.conf similarity index 53% rename from extra/ffmuc10.conf rename to domains/ffmuc10.conf index 5a5edd4..64f1add 100644 --- a/extra/ffmuc10.conf +++ b/domains/ffmuc10.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Moosach', - site_code = 'ffmuc10', + domain_names = { + ffmuc10 = 'Freifunk München - Moosach' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc11.conf b/domains/ffmuc11.conf similarity index 53% rename from extra/ffmuc11.conf rename to domains/ffmuc11.conf index 21c8dd3..4c789de 100644 --- a/extra/ffmuc11.conf +++ b/domains/ffmuc11.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Milbertshofen-Am-Hart', - site_code = 'ffmuc11', + domain_names = { + ffmuc11 = 'Freifunk München - Milbertshofen-Am-Hart' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc12.conf b/domains/ffmuc12.conf similarity index 53% rename from extra/ffmuc12.conf rename to domains/ffmuc12.conf index 0cdc364..698081f 100644 --- a/extra/ffmuc12.conf +++ b/domains/ffmuc12.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Schwabing-Freimann', - site_code = 'ffmuc12', + domain_names = { + ffmuc12 = 'Freifunk München - Schwabing-Freimann' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc13.conf b/domains/ffmuc13.conf similarity index 53% rename from extra/ffmuc13.conf rename to domains/ffmuc13.conf index df6ada6..46df1d1 100644 --- a/extra/ffmuc13.conf +++ b/domains/ffmuc13.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Bogenhausen', - site_code = 'ffmuc13', + domain_names = { + ffmuc13 = 'Freifunk München - Bogenhausen' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc14.conf b/domains/ffmuc14.conf similarity index 53% rename from extra/ffmuc14.conf rename to domains/ffmuc14.conf index 6a020ff..a805962 100644 --- a/extra/ffmuc14.conf +++ b/domains/ffmuc14.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Berg am Laim', - site_code = 'ffmuc14', + domain_names = { + ffmuc14 = 'Freifunk München - Berg am Laim' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc15.conf b/domains/ffmuc15.conf similarity index 53% rename from extra/ffmuc15.conf rename to domains/ffmuc15.conf index cb3d730..4a0d918 100644 --- a/extra/ffmuc15.conf +++ b/domains/ffmuc15.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Trudering-Riem', - site_code = 'ffmuc15', + domain_names = { + ffmuc15 = 'Freifunk München - Trudering-Riem' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc16.conf b/domains/ffmuc16.conf similarity index 53% rename from extra/ffmuc16.conf rename to domains/ffmuc16.conf index ca9a511..edf4d51 100644 --- a/extra/ffmuc16.conf +++ b/domains/ffmuc16.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Ramersdorf-Perlach', - site_code = 'ffmuc16', + domain_names = { + ffmuc16 = 'Freifunk München - Ramersdorf-Perlach' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc17.conf b/domains/ffmuc17.conf similarity index 53% rename from extra/ffmuc17.conf rename to domains/ffmuc17.conf index 69902bd..06e1122 100644 --- a/extra/ffmuc17.conf +++ b/domains/ffmuc17.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Giesing', - site_code = 'ffmuc17', + domain_names = { + ffmuc17 = 'Freifunk München - Giesing' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc19.conf b/domains/ffmuc19.conf similarity index 53% rename from extra/ffmuc19.conf rename to domains/ffmuc19.conf index c54487d..0594c14 100644 --- a/extra/ffmuc19.conf +++ b/domains/ffmuc19.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Thalkirchen-Obersendling-Forstenried-Fürstenried-Solln', - site_code = 'ffmuc19', + domain_names = { + ffmuc19 = 'Freifunk München - Thalkirchen-Obersendling-Forstenried-Fürstenried-Solln' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc20.conf b/domains/ffmuc20.conf similarity index 53% rename from extra/ffmuc20.conf rename to domains/ffmuc20.conf index 2e92b81..36e433b 100644 --- a/extra/ffmuc20.conf +++ b/domains/ffmuc20.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Hadern', - site_code = 'ffmuc20', + domain_names = { + ffmuc20 = 'Freifunk München - Hadern' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc21.conf b/domains/ffmuc21.conf similarity index 53% rename from extra/ffmuc21.conf rename to domains/ffmuc21.conf index dc5c243..05a63cb 100644 --- a/extra/ffmuc21.conf +++ b/domains/ffmuc21.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Pasing-Obermenzing', - site_code = 'ffmuc21', + domain_names = { + ffmuc21 = 'Freifunk München - Pasing-Obermenzing' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc22.conf b/domains/ffmuc22.conf similarity index 53% rename from extra/ffmuc22.conf rename to domains/ffmuc22.conf index aff2e10..0532da4 100644 --- a/extra/ffmuc22.conf +++ b/domains/ffmuc22.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Aubing-Lochhausen-Langwied', - site_code = 'ffmuc22', + domain_names = { + ffmuc22 = 'Freifunk München - Aubing-Lochhausen-Langwied' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc23.conf b/domains/ffmuc23.conf similarity index 53% rename from extra/ffmuc23.conf rename to domains/ffmuc23.conf index fcf69e8..38f0462 100644 --- a/extra/ffmuc23.conf +++ b/domains/ffmuc23.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Allach-Untermenzing', - site_code = 'ffmuc23', + domain_names = { + ffmuc23 = 'Freifunk München - Allach-Untermenzing' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc24.conf b/domains/ffmuc24.conf similarity index 53% rename from extra/ffmuc24.conf rename to domains/ffmuc24.conf index ef72ff1..2642917 100644 --- a/extra/ffmuc24.conf +++ b/domains/ffmuc24.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Feldmoching-Hasenbergl', - site_code = 'ffmuc24', + domain_names = { + ffmuc24 = 'Freifunk München - Feldmoching-Hasenbergl' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc25.conf b/domains/ffmuc25.conf similarity index 53% rename from extra/ffmuc25.conf rename to domains/ffmuc25.conf index 01a61bf..71b1d4b 100644 --- a/extra/ffmuc25.conf +++ b/domains/ffmuc25.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - Laim', - site_code = 'ffmuc25', + domain_names = { + ffmuc25 = 'Freifunk München - Laim' + }, 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc_land.conf b/domains/ffmuc_land.conf similarity index 53% rename from extra/ffmuc_land.conf rename to domains/ffmuc_land.conf index d4bfacc..b706665 100644 --- a/extra/ffmuc_land.conf +++ b/domains/ffmuc_land.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München - München-Land', - site_code = 'ffmuc_land', + domain_names = { + ffmuc_land = 'Freifunk München - München-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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc_umland.conf b/domains/ffmuc_umland.conf similarity index 50% rename from extra/ffmuc_umland.conf rename to domains/ffmuc_umland.conf index ffa9217..f3f9c27 100644 --- a/extra/ffmuc_umland.conf +++ b/domains/ffmuc_umland.conf @@ -1,7 +1,7 @@ { - hostname_prefix = '', - site_name = 'Freifunk München Umland [ALT]', - site_code = 'ffmuc_umland', + domain_names = { + ffmuc_umland = 'Freifunk München Umland [ALT]' + }, 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 = { - -- id = 'ffmuc-umland-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-umland-mesh', + 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 = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-mesh', + 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 diff --git a/extra/ffmuc_welcome.conf b/domains/ffmuc_welcome.conf similarity index 50% rename from extra/ffmuc_welcome.conf rename to domains/ffmuc_welcome.conf index 49a309e..9fe65e3 100644 --- a/extra/ffmuc_welcome.conf +++ b/domains/ffmuc_welcome.conf @@ -1,7 +1,7 @@ { - hostname_prefix = 'welcome', - site_name = 'Freifunk München Welcome', - site_code = 'ffmuc_welcome', + domain_names = { + ffmuc_welcome = 'Freifunk München 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 = { - -- id = 'ffmuc-welcome-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-welcome-mesh', + 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 = { - -- id = 'ffmuc-welcome-mesh', - -- mcast_rate = 12000, - --}, + mesh = { + id = 'ffmuc-welcome-mesh', + mcast_rate = 12000, + disabled = true, + }, ibss = { ssid = 'mesh.ffmuc.welcome', bssid = '02:0E:8E:1E:61:18', @@ -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 diff --git a/site.conf b/site.conf index 387ede7..a2d4e3e 100644 --- a/site.conf +++ b/site.conf @@ -1,7 +1,8 @@ { hostname_prefix = 'ffmuc-', - site_name = 'Freifunk München [ALT]', + site_name = 'Freifunk München', site_code = 'ffmuc', + default_domain = 'ffmuc_welcome', opkg = { extra = { @@ -9,13 +10,6 @@ }, }, - -- 32 bytes of random data, encoded in hexadecimal - -- This data must be unique among all sites and domains! - domain_seed = '8f6cb3915d9cff8e556a88ee9326349b23a251e056465afbd9f5e5c01c86c7c7', - - 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' }, @@ -27,32 +21,20 @@ 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 = { + 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 = { - ssid = 'muenchen.freifunk.net', + mesh = { + mcast_rate = 12000, }, - --mesh = { - -- id = 'ffmuc-mesh', - -- mcast_rate = 12000, - --}, ibss = { - ssid = 'mesh.ffmuc', - bssid = '02:0E:8E:1E:61:17', mcast_rate = 12000, }, }, @@ -63,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, diff --git a/site.mk b/site.mk index 1e9faf9..b2d4a2e 100644 --- a/site.mk +++ b/site.mk @@ -1,3 +1,5 @@ +GLUON_MULTIDOMAIN=1 + GLUON_FEATURES := \ respondd \ autoupdater \ @@ -11,11 +13,11 @@ GLUON_FEATURES := \ mesh-batman-adv-15 \ mesh-vpn-fastd \ radvd \ - setup-mode \ status-page \ - config-mode-site-select \ + config-mode-domain-select \ ebtables-filter-arp-ffmuc \ - ebtables-filter-multicast-ffmuc + ebtables-filter-multicast-ffmuc \ + domain-migration-ffmuc GLUON_SITE_PACKAGES := \ iwinfo \ -- 2.39.5 From df8447a7a401814f28cde343d487b53bde5cc439 Mon Sep 17 00:00:00 2001 From: Krombel Date: Thu, 2 Aug 2018 07:01:14 +0200 Subject: [PATCH 03/17] enable ebtables-limit-arp --- site.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/site.mk b/site.mk index b2d4a2e..ded386c 100644 --- a/site.mk +++ b/site.mk @@ -4,6 +4,7 @@ GLUON_FEATURES := \ respondd \ autoupdater \ web-wizard \ + ebtables-limit-arp \ ebtables-filter-multicast \ ebtables-filter-ra-dhcp \ web-admin \ -- 2.39.5 From f718c05a333dd7b76c8e71128ceab4269b67ba54 Mon Sep 17 00:00:00 2001 From: Krombel Date: Thu, 2 Aug 2018 05:38:46 +0200 Subject: [PATCH 04/17] use my repo for ffmuc gluon-packages --- modules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules b/modules index 8dbd6af..bbb8667 100644 --- a/modules +++ b/modules @@ -1,5 +1,5 @@ GLUON_SITE_FEEDS='ffmuc' -PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git -PACKAGES_FFMUC_BRANCH=master -PACKAGES_FFMUC_COMMIT=5632eaba747ac356b68f5d40f30233eafc785975 +PACKAGES_FFMUC_REPO=https://github.com/krombel/gluon-packages.git +PACKAGES_FFMUC_BRANCH=add_domain-migration-ffmuc +PACKAGES_FFMUC_COMMIT=f9db13e6a4721beaf8dda28f7f161a22aec51a4e -- 2.39.5 From 43900e38a692200ac93883741edf9c2ea1adb150 Mon Sep 17 00:00:00 2001 From: Krombel Date: Tue, 4 Sep 2018 13:07:09 +0200 Subject: [PATCH 05/17] update packages commit id --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index bbb8667..1ebf861 100644 --- a/modules +++ b/modules @@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffmuc' PACKAGES_FFMUC_REPO=https://github.com/krombel/gluon-packages.git PACKAGES_FFMUC_BRANCH=add_domain-migration-ffmuc -PACKAGES_FFMUC_COMMIT=f9db13e6a4721beaf8dda28f7f161a22aec51a4e +PACKAGES_FFMUC_COMMIT=d529439a7e9c90a74617158b96e2e538cb777962 -- 2.39.5 From 1bce3ad02b6b89f084a8fb544813a5963a41bf73 Mon Sep 17 00:00:00 2001 From: Krombel Date: Wed, 5 Sep 2018 23:07:33 +0200 Subject: [PATCH 06/17] Add url to tmp builds --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 39cdc18..3e43b40 100644 --- a/README.md +++ b/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 -- 2.39.5 From 8de472c3d438981cb40cd1722668b07578e3feb2 Mon Sep 17 00:00:00 2001 From: Krombel Date: Tue, 9 Oct 2018 16:46:37 +0200 Subject: [PATCH 07/17] update to v2018.1.1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d6938c4..d411731 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2018.1 +GLUON_GIT_REF := v2018.1.1 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key -- 2.39.5 From 247b8bdaf603a0b6f3cb2baa3e5a2abbb4d28a7e Mon Sep 17 00:00:00 2001 From: Krombel Date: Tue, 9 Oct 2018 16:47:17 +0200 Subject: [PATCH 08/17] ffmuc-mesh => ffmuc-umland-mesh for 5Ghz as well --- domains/ffbay_dah.conf | 2 +- domains/ffbay_ebe.conf | 2 +- domains/ffbay_ed.conf | 2 +- domains/ffbay_ffb.conf | 2 +- domains/ffbay_fs.conf | 2 +- domains/ffbay_sta.conf | 2 +- domains/ffbay_tol.conf | 2 +- domains/ffmuc_umland.conf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/domains/ffbay_dah.conf b/domains/ffbay_dah.conf index a30f857..58d8786 100644 --- a/domains/ffbay_dah.conf +++ b/domains/ffbay_dah.conf @@ -37,7 +37,7 @@ ssid = 'muenchen.freifunk.net', }, mesh = { - id = 'ffmuc-mesh', + id = 'ffmuc-umland-mesh', mcast_rate = 12000, disabled = true, }, diff --git a/domains/ffbay_ebe.conf b/domains/ffbay_ebe.conf index 6795480..7da7859 100644 --- a/domains/ffbay_ebe.conf +++ b/domains/ffbay_ebe.conf @@ -37,7 +37,7 @@ ssid = 'muenchen.freifunk.net', }, mesh = { - id = 'ffmuc-mesh', + id = 'ffmuc-umland-mesh', mcast_rate = 12000, disabled = true, }, diff --git a/domains/ffbay_ed.conf b/domains/ffbay_ed.conf index 0b15ffc..ea2369a 100644 --- a/domains/ffbay_ed.conf +++ b/domains/ffbay_ed.conf @@ -37,7 +37,7 @@ ssid = 'muenchen.freifunk.net', }, mesh = { - id = 'ffmuc-mesh', + id = 'ffmuc-umland-mesh', mcast_rate = 12000, disabled = true, }, diff --git a/domains/ffbay_ffb.conf b/domains/ffbay_ffb.conf index bd1ab3c..457987b 100644 --- a/domains/ffbay_ffb.conf +++ b/domains/ffbay_ffb.conf @@ -37,7 +37,7 @@ ssid = 'muenchen.freifunk.net', }, mesh = { - id = 'ffmuc-mesh', + id = 'ffmuc-umland-mesh', mcast_rate = 12000, disabled = true, }, diff --git a/domains/ffbay_fs.conf b/domains/ffbay_fs.conf index db85c64..a26320f 100644 --- a/domains/ffbay_fs.conf +++ b/domains/ffbay_fs.conf @@ -37,7 +37,7 @@ ssid = 'muenchen.freifunk.net', }, mesh = { - id = 'ffmuc-mesh', + id = 'ffmuc-umland-mesh', mcast_rate = 12000, disabled = true, }, diff --git a/domains/ffbay_sta.conf b/domains/ffbay_sta.conf index bb8a645..ac8cd59 100644 --- a/domains/ffbay_sta.conf +++ b/domains/ffbay_sta.conf @@ -37,7 +37,7 @@ ssid = 'muenchen.freifunk.net', }, mesh = { - id = 'ffmuc-mesh', + id = 'ffmuc-umland-mesh', mcast_rate = 12000, disabled = true, }, diff --git a/domains/ffbay_tol.conf b/domains/ffbay_tol.conf index 36b4118..412de3a 100644 --- a/domains/ffbay_tol.conf +++ b/domains/ffbay_tol.conf @@ -37,7 +37,7 @@ ssid = 'muenchen.freifunk.net', }, mesh = { - id = 'ffmuc-mesh', + id = 'ffmuc-umland-mesh', mcast_rate = 12000, disabled = true, }, diff --git a/domains/ffmuc_umland.conf b/domains/ffmuc_umland.conf index f3f9c27..44e8335 100644 --- a/domains/ffmuc_umland.conf +++ b/domains/ffmuc_umland.conf @@ -37,7 +37,7 @@ ssid = 'muenchen.freifunk.net', }, mesh = { - id = 'ffmuc-mesh', + id = 'ffmuc-umland-mesh', mcast_rate = 12000, disabled = true, }, -- 2.39.5 From b1870f5944c04a11adb4d2e110b3fb94312cccc7 Mon Sep 17 00:00:00 2001 From: Krombel Date: Tue, 9 Oct 2018 16:47:33 +0200 Subject: [PATCH 09/17] set ffmuc as default domain --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index a2d4e3e..be949df 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,7 @@ hostname_prefix = 'ffmuc-', site_name = 'Freifunk München', site_code = 'ffmuc', - default_domain = 'ffmuc_welcome', + default_domain = 'ffmuc', opkg = { extra = { -- 2.39.5 From 5a7f4f60c5899798a007aaf15d3e8ad65b144011 Mon Sep 17 00:00:00 2001 From: Krombel Date: Tue, 9 Oct 2018 18:44:01 +0200 Subject: [PATCH 10/17] update CHANGELOG.md to v2018.1.1 --- CHANGELOG.md | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7873ef4..b924f4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,24 @@ # Freifunk München Firmware Changelog ## v2018.1 - - Updated to Gluon v2018.1 + - Updated to Gluon v2018.1.1 - Changes: - - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.html - - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.1.html - - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.2.html - - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.3.html - - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.4.html - - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.5.html - - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.6.html - - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.7.html - - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.8.html - - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2018.1.html + - 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 -- 2.39.5 From 2586e40966c9580a51e5112d2ff404214bb8e84f Mon Sep 17 00:00:00 2001 From: Krombel Date: Mon, 19 Nov 2018 15:13:26 +0100 Subject: [PATCH 11/17] disable vxlan for legacy support --- site.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/site.conf b/site.conf index be949df..9f8f5b1 100644 --- a/site.conf +++ b/site.conf @@ -40,6 +40,7 @@ }, mesh = { + vxlan = false, -- legacy support batman_adv = { gw_sel_class = 3, }, -- 2.39.5 From 91211e71acb1d3fc8d1b8cde32801872239f95ff Mon Sep 17 00:00:00 2001 From: Krombel Date: Mon, 19 Nov 2018 15:15:18 +0100 Subject: [PATCH 12/17] rm ffmuc-mod for arp and multicast (as now handled per upstream) --- site.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/site.mk b/site.mk index ded386c..9664d02 100644 --- a/site.mk +++ b/site.mk @@ -16,8 +16,6 @@ GLUON_FEATURES := \ radvd \ status-page \ config-mode-domain-select \ - ebtables-filter-arp-ffmuc \ - ebtables-filter-multicast-ffmuc \ domain-migration-ffmuc GLUON_SITE_PACKAGES := \ -- 2.39.5 From c5a9b2e4f8b8c49bd7e6a2693b86d2469f8e1cbb Mon Sep 17 00:00:00 2001 From: Krombel Date: Mon, 19 Nov 2018 17:19:57 +0100 Subject: [PATCH 13/17] set default mesh to ibss (legacy) --- site.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site.mk b/site.mk index 9664d02..08510a2 100644 --- a/site.mk +++ b/site.mk @@ -166,6 +166,9 @@ 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) -- 2.39.5 From 7a817220f44f04b8f5dde21185ee9471c0ab7149 Mon Sep 17 00:00:00 2001 From: Krombel Date: Mon, 19 Nov 2018 18:35:30 +0100 Subject: [PATCH 14/17] fix vxlan config - disable only for used domains --- domains/ffmuc.conf | 1 + domains/ffmuc_umland.conf | 1 + domains/ffmuc_welcome.conf | 1 + site.conf | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/domains/ffmuc.conf b/domains/ffmuc.conf index 3ceb31d..90645ef 100644 --- a/domains/ffmuc.conf +++ b/domains/ffmuc.conf @@ -49,6 +49,7 @@ }, mesh = { + vxlan = false, -- legacy support batman_adv = { gw_sel_class = 3, }, diff --git a/domains/ffmuc_umland.conf b/domains/ffmuc_umland.conf index 44e8335..a1e20ec 100644 --- a/domains/ffmuc_umland.conf +++ b/domains/ffmuc_umland.conf @@ -49,6 +49,7 @@ }, mesh = { + vxlan = false, -- legacy support batman_adv = { gw_sel_class = 3, }, diff --git a/domains/ffmuc_welcome.conf b/domains/ffmuc_welcome.conf index 9fe65e3..7178252 100644 --- a/domains/ffmuc_welcome.conf +++ b/domains/ffmuc_welcome.conf @@ -49,6 +49,7 @@ }, mesh = { + vxlan = false, -- legacy support batman_adv = { gw_sel_class = 3, }, diff --git a/site.conf b/site.conf index 9f8f5b1..be949df 100644 --- a/site.conf +++ b/site.conf @@ -40,7 +40,6 @@ }, mesh = { - vxlan = false, -- legacy support batman_adv = { gw_sel_class = 3, }, -- 2.39.5 From ffe3314fb03045e83a67dad89aea8200ec18cb2a Mon Sep 17 00:00:00 2001 From: Krombel Date: Tue, 20 Nov 2018 00:44:36 +0100 Subject: [PATCH 15/17] add public sign key for krombel --- site.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site.conf b/site.conf index be949df..7a6305a 100644 --- a/site.conf +++ b/site.conf @@ -66,6 +66,7 @@ probability = 0.1, good_signatures = 3, pubkeys = { + '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris @@ -81,6 +82,7 @@ probability = 0.5, good_signatures = 2, pubkeys = { + '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris -- 2.39.5 From dec054ea6a21dc724f931398253afc5782b298d6 Mon Sep 17 00:00:00 2001 From: Krombel Date: Thu, 29 Nov 2018 17:46:20 +0100 Subject: [PATCH 16/17] use freifunkMUC's repo again --- modules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules b/modules index 1ebf861..d769e6b 100644 --- a/modules +++ b/modules @@ -1,5 +1,5 @@ GLUON_SITE_FEEDS='ffmuc' -PACKAGES_FFMUC_REPO=https://github.com/krombel/gluon-packages.git -PACKAGES_FFMUC_BRANCH=add_domain-migration-ffmuc -PACKAGES_FFMUC_COMMIT=d529439a7e9c90a74617158b96e2e538cb777962 +PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git +PACKAGES_FFMUC_BRANCH=master +PACKAGES_FFMUC_COMMIT=bfbbaa0b9fba5ff1bf8cda945f6c1e757f038c05 -- 2.39.5 From d7363b2351d66e192b86c3eca71cace6bb796a9e Mon Sep 17 00:00:00 2001 From: Krombel Date: Fri, 11 Jan 2019 23:46:51 +0100 Subject: [PATCH 17/17] update to gluon-v2018.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d411731..438313b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2018.1.1 +GLUON_GIT_REF := v2018.2 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key -- 2.39.5