Merge branch 'beta' of github.com:freifunk-stuttgart/site-ffs into beta

README.md

@@ -7,6 +7,9 @@ Freifunk Stuttgart specific Gluon configuration
 Doku: https://gluon.readthedocs.org/en/latest/user/site.html
 
 Gluon versions used for specific Stuttgart Freifunk Firmware builds:
+* ffs-1.3: v2016.2.7 + 1340 mtu
+* ffs-1.2: v2016.2.6 + ffs-set-segment dns fix + 1312 mtu
+* ffs-1.1: v2016.2.6 + ffs-set-segment dns fix
 * ffs-1.0: v2016.2.5
 * ffs-0.9: v2016.2.1
 * ffs-0.8: v2016.2

i18n/de.po

@@ -45,6 +45,8 @@ msgstr ""
 "Weitere Informationen zur Freifunk-Community findest du auf den Webseiten von "
 "<a href=\"http://www.freifunk-suttgart.de/\" target=\"_blank\">Freifunk Stuttgart</a> oder unter <a href=\"http://www.freifunk.net/\" target=\"_blank\">freifunk.net</a>. "
 "<dl> "
+"    <dt>Freifunk Community</dt> "
+"        <dd>Die stuttgarter Freifunker vernetzen sich per Mailingliste. Hier kannst du Fragen stellen oder dich einbringen: <a href=\"https://lists.freifunk-stuttgart.de/listinfo/misc\" target=\"_blank\">lists.freifunk-stuttgart.de/listinfo/misc</a>.</dd> "
 "    <dt>Konfigurations Modus</dt> "
 "        <dd>Du kannst jederzeit in diesen Konfigurations Modus zurückkehren indem du ca. 10 Sekunden den Resetknopf am Knoten drückst, bis alle Lämpchen einmal gemeinsam aufleuchten, und dann losläßt.</dd> "
 "    <dt>Karte</dt> "
@@ -52,6 +54,8 @@ msgstr ""
 "    <dt>Next Node</dt> "
 "        <dd>Den Router mit dem man momentan verbunden ist, kann man immer unter der sogenannten Next Node Adresse erreichen. Diese ist für jeden Router gleich:</dd> "
 "        <dd>&bull; Stuttgart &mdash; <a href=\"http://[fd21:711::1]/\" target=\"_blank\">fd21:711::1</a></dd>"
+"    <dt>Nodealarm</dt> "
+"        <dd>Unter <a href=\"https://nodealarm.freifunk-stuttgart.de/\" target=\"_blank\">nodealarm.freifunk-stuttgart.de</a> kannst du per E-Mail Benachrichtigen lassen, sollte dein Router mal offline sein.</dd> "
 "</dl> "
 "Viel Spaß mit deinem Knoten und bei der Erkundung von Freifunk!<br /> "
 "<small>Hilf uns weitere Anleitungen, Texte, Grafiken, Applikationen, Schaubilder, und ähnliches zu erstellen die wir hier verlinken können, um jedem neuen Freifunker einen guten Start zu ermöglichen.</small>"

i18n/en.po

@@ -22,7 +22,7 @@ msgstr ""
 "<p>This is your Freifunk node's public key. Please connect the WAN-Port "
 "of your Freifunk node with the LAN-Port of your home router. The node will "
 "automatically register at the Freifunk Stuttgart project. This could take "
-"some while till all the Gateways accept your key. If the node won't be able "
+"a while till all the gateways accept your key. If the node won't be able "
 "to connect to the mesh VPN, you have to send the key together with your "
 "node's name (<em><%=escape(hostname)%></em>) and MAC (<em><%=sysconfig.primary_mac%></em>) to "
 "<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&amp;subject=New%20Freifunk-Node%3A%20<%=urlescape(hostname)%>&amp;body=Name%3A%20<%=urlescape(hostname)%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">vpn-schluessel@lists.freifunk-stuttgart.net</a> - "
@@ -41,6 +41,7 @@ msgstr ""
 "nearby Freifunk nodes  after that. "
 "You can find lots of information on the Freifunk Stuttgart community on "
 "<a href=\"http://www.freifunk-stuttgart.de/\">our homepage</a>.</p>"
+"<p>If you want to get in contact with us: <a href=\"https://lists.freifunk-stuttgart.de/listinfo/misc\" target=\"_blank\">lists.freifunk-stuttgart.de/listinfo/misc</a>.</p>"
 "<p>To get back to this configuration interface, press the reset button for "
 "10 seconds during normal operation. The device will then reboot into config "
 "mode.</p>"

modules

 GLUON_SITE_FEEDS='ffs'
 
 PACKAGES_FFS_REPO=https://github.com/freifunk-stuttgart/Gluon-Packages
-PACKAGES_FFS_COMMIT=b107f65b9edb3c1c2f1bed59afec608f7f055585
+PACKAGES_FFS_COMMIT=c22cea54014470b0b6593ef7dc3170529582e316

site.conf

@@ -25,6 +25,10 @@
         ap = {
             ssid = 'Freifunk',
         },
+        mesh = {
+            id = 'ffsmesh_batman',
+            mcast_rate = 12000,
+        },
         ibss = {
             ssid = '02:04:08:16:32:64',
             bssid = '02:04:08:16:32:64',
@@ -37,6 +41,10 @@
         ap = {
             ssid = 'Freifunk',
         },
+        mesh = {
+            id = 'ffsmesh_batman',
+            mcast_rate = 12000,
+        },
         ibss = {
             ssid = '02:04:08:16:32:64',
             bssid = '02:04:08:16:32:64',
@@ -53,7 +61,7 @@
 
     fastd_mesh_vpn = {
         methods = {'salsa2012+umac'},
-        mtu = 1406,
+        mtu = 1340,
         enabled = true,
         groups = {
             backbone = {
@@ -62,61 +70,61 @@
                     gw01 = {
                         key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
                         remotes = {
-                            '"gw01.gw.freifunk-stuttgart.de" port 10037'
+                            '"gw01.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw02 = {
                         key = '31eaff2ce1c19d0c9af693c4500defc4e1b4979ad75133d779532f0572955875',
                         remotes = {
-                            '"gw02.gw.freifunk-stuttgart.de" port 10037'
+                            '"gw02.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw03 = {
                         key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
                         remotes = {
-                            '"gw03.gw.freifunk-stuttgart.de" port 10037'
+                            '"gw03.gw.freifunk-stuttgart.de" port 10299'
 			},
                     },
                     gw04 = {
                         key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
                         remotes = {
-                            '"gw04.gw.freifunk-stuttgart.de" port 10037'
+                            '"gw04.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw05 = {
                         key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
                         remotes = {
-                            '"gw05.gw.freifunk-stuttgart.de" port 10037'
+                            '"gw05.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw06 = {
                         key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
                         remotes = {
-                            '"gw06.gw.freifunk-stuttgart.de" port 10037'
+                            '"gw06.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw07 = {
                         key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
                         remotes = {
-                            '"gw07.gw.freifunk-stuttgart.de" port 10037'
+                            '"gw07.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw08 = {
                         key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
                         remotes = {
-                            '"gw08.gw.freifunk-stuttgart.de" port 10037'
+                            '"gw08.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw09 = {
                         key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
                         remotes = {
-                            '"gw09.gw.freifunk-stuttgart.de" port 10037'
+                            '"gw09.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                     gw10 = {
                         key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
                         remotes = {
-                            '"gw10.gw.freifunk-stuttgart.de" port 10037'
+                            '"gw10.gw.freifunk-stuttgart.de" port 10299'
                         },
                     },
                 },

site.mk

@@ -26,6 +26,7 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	iwinfo \
 	ffs-set-segment \
+	ffs-watchdog \
 
 # add addition network drivers and usb support only to targes where disk space does not matter.
 ifeq ($(GLUON_TARGET),x86-generic)
@@ -45,7 +46,7 @@ GLUON_SITE_PACKAGES += \
 	kmod-igb
 endif
 
-DEFAULT_GLUON_RELEASE := 1.0+$(shell date '+%Y-%m-%d')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
+DEFAULT_GLUON_RELEASE := 1.3+$(shell date '+%Y-%m-%d')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
 
 GLUON_LANGS := de en
 
@@ -59,4 +60,4 @@ GLUON_REGION ?= eu
 GLUON_PRIORITY ?= 0.1
 
 #enable generation of images for ath10k devices with ibss mode
-GLUON_ATH10K_MESH=ibss
+GLUON_ATH10K_MESH ?= 11s