Switch autoupdater URL back to main firmware repo path

LUA does not like '-', so ffmuc-umland was renamed to ffmuc_umland
Several testing has still to be done (especially upgrade to/from a firmware with site-select)

CHANGELOG.md

@@ -1,9 +1,12 @@
 # Freifunk München Firmware Changelog
 
-## v2015.5-altdorf
+## v2015.6.1
- - Added additional Autoupdate Server for altdorf
+ * Added support of site selection in config mode
- - Added additional Autoupdate Signatures for altdorf
+ * Switch autoupdater URL back to main firmware repo path
- - Made changes necessary for Altdorf in i18n folder
+
+## v2015.6
+ - Updated to Gluon 2015.1.2
+   - Changes: https://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.2.html
 
 ## v2015.5
  - Updated to Gluon 2015.1.1
@@ -46,10 +49,6 @@
  - Use internal NTP server 0.ntp.ffmuc.net
  - Connections from nodes to gateways only over IPv4 for now (MTU issues)
 
-## v2015.1-altdorf
- - Changed SSID to altdorf.freifunk.net
- - Changed Autoupdater URLs for altdorf firmware
-
 ## v2015.1
  - Updated to Gluon 2014.4 release
  - Autoupdater

Makefile

@@ -1,12 +1,14 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
+GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git
-GLUON_GIT_REF := v2015.1.1
+GLUON_GIT_REF := 4268d32a8d70fa734b2d025972c5caca27705142
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
 GLUON_TARGETS ?= \
 	ar71xx-generic \
 	ar71xx-nand \
+	mpc85xx-generic \
+	x86-generic \
 	x86-kvm_guest
 
 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
@@ -16,7 +18,9 @@ else
   GLUON_BRANCH := experimental
 endif
 
-GLUON_MAKE := ${MAKE} -C ${GLUON_BUILD_DIR} \
+JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
+
+GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
 			GLUON_BRANCH=${GLUON_BRANCH}
 
@@ -26,7 +30,7 @@ all: info
 info:
 	@echo
 	@echo '#########################'
-	@echo '# FFMUC Firmare build'
+	@echo '# FFMUC Firmware build'
 	@echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}'
 	@echo
 

extra/ffmuc.conf

@@ -0,0 +1,155 @@
+{
+  hostname_prefix = '',
+  site_name = 'Freifunk München',
+  site_code = 'ffmuc',
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  prefix4 = '10.80.32.0/19',
+  prefix6 = 'fdef:ffc0:4fff::/64',
+
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
+
+  mesh_on_wan = false,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 6,
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc',
+    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_mcast_rate = 12000,
+  },
+
+  wifi5 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 44,
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc',
+    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_mcast_rate = 12000,
+  },
+
+  next_node = {
+    ip4 = '10.80.32.1',
+    ip6 = 'fdef:ffc0:4fff::1',
+    mac = '16:41:95:40:f7:dc',
+  },
+
+  fastd_mesh_vpn = {
+    methods = {'salsa2012+umac'},
+    mtu = 1426,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gw03 = {
+            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
+            remotes = {
+              'ipv4 "gw03.ffmuc.net" port 10000',
+              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw04 = {
+            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
+            remotes = {
+              'ipv4 "gw04.ffmuc.net" port 10000',
+              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw05 = {
+            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
+            remotes = {
+              'ipv4 "gw05.ffmuc.net" port 10000',
+              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw06 = {
+            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
+            remotes = {
+              'ipv4 "gw06.ffmuc.net" port 10000',
+              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw07 = {
+            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
+            remotes = {
+              'ipv4 "gw07.ffmuc.net" port 10000',
+              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw08 = {
+            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
+            remotes = {
+              'ipv4 "gw08.ffmuc.net" port 10000',
+              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw09 = {
+            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
+            remotes = {
+              'ipv4 "gw09.ffmuc.net" port 10000',
+              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
+            },
+          },
+          gw10 = {
+            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
+            remotes = {
+              'ipv4 "gw10.ffmuc.net" port 10000',
+              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+        },
+        probability = 0.1,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+        },
+        probability = 0.5,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+    },
+  },
+
+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et

extra/ffmuc_umland.conf

@@ -0,0 +1,134 @@
+{
+  hostname_prefix = '',
+  site_name = 'Freifunk München Umland',
+  site_code = 'ffmuc_umland',
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  prefix4 = '10.80.96.0/19',
+  prefix6 = 'fdef:ffc0:4fff:2::/64',
+
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
+
+  mesh_on_wan = false,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 6,
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc.umland',
+    mesh_bssid = '02:0E:8E:1E:61:19',
+    mesh_mcast_rate = 12000,
+  },
+
+  wifi5 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 44,
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc.umland',
+    mesh_bssid = '02:0E:8E:1E:61:19',
+    mesh_mcast_rate = 12000,
+  },
+
+  next_node = {
+    ip4 = '10.80.96.1',
+    ip6 = 'fdef:ffc0:4fff:2::1',
+    mac = '16:41:95:40:f7:dc',
+  },
+
+  fastd_mesh_vpn = {
+    methods = {'salsa2012+umac'},
+    mtu = 1426,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gwu01 = {
+            key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
+            remotes = {
+              'ipv4 "gwu01.ffmuc.net" port 10010',
+              'ipv4 "gwu01.freifunk-muenchen.de" port 10010',
+            },
+          },
+          gwu02 = {
+            key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
+            remotes = {
+              'ipv4 "gwu02.ffmuc.net" port 10011',
+              'ipv4 "gwu02.freifunk-muenchen.de" port 10011',
+            },
+          },
+          gwu03 = {
+            key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
+            remotes = {
+              'ipv4 "gwu03.ffmuc.net" port 10012',
+              'ipv4 "gwu03.freifunk-muenchen.de" port 10012',
+            },
+          },
+          gwu04 = {
+            key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
+            remotes = {
+              'ipv4 "gwu04.ffmuc.net" port 10013',
+              'ipv4 "gwu04.freifunk-muenchen.de" port 10013',
+            },
+          },
+          gwu05 = {
+            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
+            remotes = {
+              'ipv4 "gwu05.ffmuc.net" port 10014',
+              'ipv4 "gwu05.freifunk-muenchen.de" port 10014',
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+        },
+        probability = 0.1,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+        },
+        probability = 0.5,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+    },
+  },
+
+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et

extra/ffmuc_welcome.conf

@@ -0,0 +1,127 @@
+{
+  hostname_prefix = 'welcome',
+  site_name = 'Freifunk München Welcome',
+  site_code = 'ffmuc_welcome',
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  prefix4 = '10.80.64.0/19',
+  prefix6 = 'fdef:ffc0:4fff:1::/64',
+
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
+
+  mesh_on_wan = false,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 6,
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc.welcome',
+    mesh_bssid = '02:0E:8E:1E:61:18',
+    mesh_mcast_rate = 12000,
+  },
+
+  wifi5 = {
+    ssid = 'muenchen.freifunk.net',
+    channel = 44,
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc.welcome',
+    mesh_bssid = '02:0E:8E:1E:61:18',
+    mesh_mcast_rate = 12000,
+  },
+
+  next_node = {
+    ip4 = '10.80.64.1',
+    ip6 = 'fdef:ffc0:4fff:1::1',
+    mac = '16:41:95:40:f7:dc',
+  },
+
+  fastd_mesh_vpn = {
+    methods = {'salsa2012+umac'},
+    mtu = 1426,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gwf01 = {
+            key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e',
+            remotes = {
+              'ipv4 "gwf01.ffmuc.net" port 11000',
+              'ipv4 "gwf01.freifunk-muenchen.de" port 11000',
+            },
+          },
+          gwf02 = {
+            key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35',
+            remotes = {
+              'ipv4 "gwf02.ffmuc.net" port 11000',
+              'ipv4 "gwf02.freifunk-muenchen.de" port 11001',
+            },
+          },
+          gwf03 = {
+            key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386',
+            remotes = {
+              'ipv4 "gwf03.ffmuc.net" port 11000',
+              'ipv4 "gwf03.freifunk-muenchen.de" port 11002',
+            },
+          },
+          gwf04 = {
+            key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539',
+            remotes = {
+              'ipv4 "gwf04.ffmuc.net" port 11000',
+              'ipv4 "gwf04.freifunk-muenchen.de" port 11003',
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+        },
+        probability = 0.1,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+        },
+        probability = 0.5,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+    },
+  },
+
+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et

i18n/de.po

@@ -12,38 +12,30 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Altdorfer "
+"Willkommen zum Einrichtungsassistenten für deinen neuen Münchner "
 "Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
 "entsprechend aus und sende es ab."
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Der Schlüssel "
-"wird automatisch auf den Servern des Freifunk Altdorf eingetragen "
-"sobald eine Internetverbindung hergestellt wurde."
-"Mit diesem Schlüssel kann sich dein Knoten mit dem Altdorfer Mesh-VPN verbinden. "
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Dein Knoten startet gerade neu und wird anschließend versuchen, sich "
 "mit anderen Freifunk-Knoten in seiner Nähe zu verbinden. Weitere "
-"Informationen zur Altdorfer Freifunk-Community findest du auf "
+"Informationen zur Münchner Freifunk-Community findest du auf "
-"<a href=\"http://www.freifunk-altdorf.de/\">unserer Webseite</a>. Wenn "
+"<a href=\"https://ffmuc.net/\">unserer Webseite</a>. Wenn "
 "alles geklappt hat, wirst du in ein paar Minuten unter "
-"<a href=\"http://map.freifunk-altdorf.de\">map.freifunk-altdorf.de</a> "
+"<a href=\"https://ffmuc.net/map/\">ffmuc.net/map/</a> "
 "deinen Knoten finden.</p> "
 "<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
 "Betrieb für drei Sekunden den Reset-Button. Das Gerät wird dann im Config "
 "Mode neustarten.</p>"
-"<p>Wenn Du mehr über Freifunk in Altdorf erfahren möchtest, dann besuche "
+"<p>Wenn Du mehr über Freifunk in München erfahren möchtest, dann besuche "
-"uns doch auf unserem Treffen (siehe Webseite). "
+"uns doch auf unserem monatlichen Treffen (siehe Webseite). Um mehr "
+"auf die Entwicklung zu nehmen, hast Du als Knotenbetreiber "
+"zusätzlich die Möglichkeit in unserem "
+"<a href=\"https://lqfb.freifunk-muenchen.de\">Abstimmungs- und Dokumentationssystem</a> "
+"mitzumachen. Voraussetzung ist eine persönliche Anmeldung auf einem "
+"der Treffen.</p> "
 "<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-"Melde Dich bitte unbedingt noch bei unserer Mailingliste an! "
-"<a href=\"http://freifunk-altdorf.de/verein/mailingliste.php\">altdorf@freifunk.net</a> "
-"Damit informieren wir Dich wenn es unvorhergesehen Störungen im Freifunk- Netz "
-"geben sollte oder falls Dein Router einen neue Firmware benötigt, "
-"die nicht über ein automatisches Update aufgespielt werden kann. "
-"Bestenfalls einmal im Monat weisen wir auf Zeit und Ort unseres nächsten Treffen hin. "
-"Keine Angst wir versenden garantiert keine Spam-Mails und geben Deine "
-"Mailadresse garantiert nicht weiter.</p> "
-"Dein Freifunk Team Altdorf "

i18n/en.po

@@ -12,7 +12,7 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Welcome the the setup wizard of your new Freifunk Altdorf node. "
+"Welcome the the setup wizard of your new Freifunk Munich node. "
 "Please fill out the following form and transmit it."
 
 msgid "gluon-config-mode:pubkey"
@@ -22,7 +22,7 @@ msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Your node is currently rebooting and will try to connect to other "
 "nearby Freifunk nodes. It should appear on our map at "
-"<a href=\"http://map.freifunk-altdorf.de.de\">map.freifunk-altdorf.de</a> "
+"<a href=\"https://ffmuc.net/map/\">ffmuc.net/map/</a> "
 "in a few minutes.</p> "
 "<p>To get back to this configuration interface, press the reset button for "
 "3 seconds during normal operation. The device will then reboot into config "

modules

@@ -1,4 +1,4 @@
 GLUON_SITE_FEEDS='ffmuc_packages'
 
 PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git
-PACKAGES_FFMUC_PACKAGES_COMMIT=82e721ad5d7c9eca8728954cfa1ab1d5b9168487
+PACKAGES_FFMUC_PACKAGES_COMMIT=985bfad86005c7a9f754ddc8432d88641d8183b3

site.conf

@@ -1,11 +1,11 @@
 {
   hostname_prefix = '',
-  site_name = 'Freifunk Altdorf',
+  site_name = 'Freifunk München Umland',
-  site_code = 'ffmuc',
+  site_code = 'ffmuc_umland',
   opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
 
-  prefix4 = '10.80.0.0/16',
+  prefix4 = '10.80.96.0/19',
-  prefix6 = 'fdef:ffc0:4fff::/64',
+  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' },
@@ -15,26 +15,26 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'altdorf.freifunk.net',
+    ssid = 'muenchen.freifunk.net',
     channel = 6,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc',
+    mesh_ssid = 'mesh.ffmuc.umland',
-    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_bssid = '02:0E:8E:1E:61:19',
     mesh_mcast_rate = 12000,
   },
 
   wifi5 = {
-    ssid = 'altdorf.freifunk.net',
+    ssid = 'muenchen.freifunk.net',
     channel = 44,
     htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffmuc',
+    mesh_ssid = 'mesh.ffmuc.umland',
-    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_bssid = '02:0E:8E:1E:61:19',
     mesh_mcast_rate = 12000,
   },
 
   next_node = {
-    ip4 = '10.80.0.1',
+    ip4 = '10.80.96.1',
-    ip6 = 'fdef:ffc0:4fff::1',
+    ip6 = 'fdef:ffc0:4fff:2::1',
     mac = '16:41:95:40:f7:dc',
   },
 
@@ -45,60 +45,39 @@
       backbone = {
       limit = 1,
         peers = {
-          gw03 = {   --[[ fpletz ]]
+          gwu01 = {
-            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
+            key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
             remotes = {
-              'ipv4 "gw03.ffmuc.net" port 10000',
+              'ipv4 "gwu01.ffmuc.net" port 10010',
-              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwu01.freifunk-muenchen.de" port 10010',
             },
           },
-          gw04 = {
+          gwu02 = {
-            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
+            key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
             remotes = {
-              'ipv4 "gw04.ffmuc.net" port 10000',
+              'ipv4 "gwu02.ffmuc.net" port 10011',
-              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwu02.freifunk-muenchen.de" port 10011',
             },
           },
-          gw05 = {
+          gwu03 = {
-            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
+            key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
             remotes = {
-              'ipv4 "gw05.ffmuc.net" port 10000',
+              'ipv4 "gwu03.ffmuc.net" port 10012',
-              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwu03.freifunk-muenchen.de" port 10012',
             },
           },
-          gw06 = {
+          gwu04 = {
-            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
+            key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
             remotes = {
-              'ipv4 "gw06.ffmuc.net" port 10000',
+              'ipv4 "gwu04.ffmuc.net" port 10013',
-              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwu04.freifunk-muenchen.de" port 10013',
             },
           },
-          gw07 = {
+          gwu05 = {
-            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
+            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
             remotes = {
-              'ipv4 "gw07.ffmuc.net" port 10000',
+              'ipv4 "gwu05.ffmuc.net" port 10014',
-              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwu05.freifunk-muenchen.de" port 10014',
-            },
-          },
-          gw08 = {
-            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
-            remotes = {
-              'ipv4 "gw08.ffmuc.net" port 10000',
-              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw09 = {
-            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
-            remotes = {
-              'ipv4 "gw09.ffmuc.net" port 10000',
-              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw10 = {
-            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
-            remotes = {
-              'ipv4 "gw10.ffmuc.net" port 10000',
-              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
             },
           },
         },
@@ -113,17 +92,12 @@
       stable = {
         name = 'stable',
         mirrors = {
-          'http://fw1.tecff.de/altdorf/stable/sysupgrade/',
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
-	  'http://fw2.tecff.de/altdorf/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
-          'http://firmware.ffmuc.net/altdorf/stable/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/altdorf/stable/sysupgrade/',
         },
         probability = 0.1,
         good_signatures = 2,
         pubkeys = {
-          
-          'a9ba1d78b5d48d1539c5c6824ca62d8c7ce7a79913d2f3fcf28e4f7fe4e777a8', -- walter hartl
-          'ed09d23552225f71da8a3763b17a09eb8e126ad3c4938275bd51d6d564e0ac0b', -- walter henz
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -133,17 +107,15 @@
       experimental = {
         name = 'experimental',
         mirrors = {
-          'http://fw1.tecff.de/altdorf/experimental/sysupgrade/',
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
-	  'http://fw2.tecff.de/altdorf/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
-          'http://firmware.ffmuc.net/altdorf/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/altdorf/experimental/sysupgrade/',
         },
         probability = 0.5,
-        good_signatures = 1,
+        good_signatures = 2,
         pubkeys = {
-
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
-         'a9ba1d78b5d48d1539c5c6824ca62d8c7ce7a79913d2f3fcf28e4f7fe4e777a8', -- walter hartl
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
-         'ed09d23552225f71da8a3763b17a09eb8e126ad3c4938275bd51d6d564e0ac0b', -- walter henz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
           '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
         },
       },
@@ -160,4 +132,3 @@
   },
 }
 -- vim: set ft=lua:ts=2:sw=2:et
-

site.mk

@@ -9,6 +9,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-mesh-vpn \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-contact-info \
+	gluon-config-mode-site-select \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-luci-admin \