Merge pull request #28 from freifunk-stuttgart/feature/2017.1.x

Feature/2017.1.x

README.md

@@ -7,7 +7,7 @@ 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.4: v2017.1.4
+* ffs-1.4: v2017.1.4 (LEDE)
 * 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

i18n/de.po

@@ -24,13 +24,9 @@ msgstr ""
 "Deines Heimrouters zu verbinden. Der Knoten wird sich dann selbständig bei dem Stuttgarter Freifunk-Projekt registrieren. "
 "Dies kann wenige Minuten dauern, bis der Schlüssel von den Gateways akzeptiert wird. "
 "Wenn sich dein Knoten NICHT mit den Mesh-VPNs in Stuttgart verbinden kann, "
-"dann schicke bitte diesen Schlüssel, mit den Namen deines Knotens (<em><%=escape(hostname)%></em>) und die MAC-Adresse (<em><%=sysconfig.primary_mac%></em>) "
-"an <a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&amp;subject=Neuer%20Freifunk-Knoten%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> - "
-"<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&amp;subject=Neuer%20Freifunk-Knoten%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\">Email jetzt absenden</a>. "
-"<small>Ein Klick auf den E-Mail Link müsste&trade; dein E-Mail Programm "
-"öffnen und alle benötigten Informationen in eine neue Mail einfügen.</small></p>"
+"dann findest Du <a href=\"https://wiki.freifunk-stuttgart.net/kontakt:mailingliste\">hier</a> Kontaktmöglichkeiten"
 "<div class=\"the-key\">"
-" Name: <%=escape(hostname)%>"
+" Name: <%=pcdata(hostname)%>"
 " <br/>"
 " Key: <%= pubkey %>"
 " <br/>"

i18n/en.po

@@ -22,13 +22,10 @@ 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 "
-"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> - "
-"<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\">click to send mail</a>. </p>"
+"a while till all the gateways accept your key. "
+"If the node won't be able to connect to the mesh VPN, you can find contact information <a href=\"https://wiki.freifunk-stuttgart.net/kontakt:mailingliste\">here</a> "
 "<div class=\"the-key\">"
-" Name: <%=escape(hostname)%>"
+" Name: <%=pcdata(hostname)%>"
 " <br/>"
 " Key: <%= pubkey %>"
 " <br/>"

modules

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

site.conf

@@ -2,6 +2,7 @@
     hostname_prefix = 'ffs-',
     site_name = 'Freifunk Stuttgart',
     site_code = 'ffs',
+    site_seed = '0711ff0711ff0711ff0711ff0711ff0711ff0711ff0711ff0711ff0711ff0711',
 
     prefix4 = '172.21.0.0/18',
     prefix6 = 'fd21:711::/64',
@@ -49,10 +50,12 @@
         mac = '02:00:0a:25:00:01',
     },
 
-    fastd_mesh_vpn = {
-        methods = {'salsa2012+umac'},
-        mtu = 1340,
+    mesh_vpn = {
 	enabled = true,
+        mtu = 1340,
+        fastd = {
+            configurable = true,
+            methods = {'salsa2012+umac'},
             groups = {
                 backbone = {
                     limit = 1,
@@ -128,6 +131,7 @@
             -- Default download limit (kbit/s).
             ingress = 15000,
         },
+    },
 
     autoupdater = {
         enabled = 1,

site.mk

+GLUON_FEATURES := \
+	autoupdater \
+	ebtables-filter-multicast \
+	ebtables-filter-ra-dhcp \
+	mesh-batman-adv-15 \
+	mesh-vpn-fastd \
+	radvd \
+	respondd \
+	alfred \
+	status-page \
+	web-advanced \
+	web-wizard
+
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
 	gluon-alfred \
@@ -12,11 +25,11 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-zip \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
-	gluon-luci-admin \
-	gluon-luci-autoupdater \
-	gluon-luci-portconfig \
-	gluon-luci-private-wifi \
-	gluon-luci-wifi-config \
+	gluon-web-admin \
+	gluon-web-autoupdater \
+	gluon-web-wifi-config \
+	gluon-web-private-wifi \
+	gluon-web-mesh-vpn-fastd \
 	gluon-neighbour-info \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
@@ -26,7 +39,7 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	iwinfo \
 	ffs-set-segment \
-	ffs-watchdog \
+	ffs-watchdog
 
 # add addition network drivers and usb support only to targes where disk space does not matter.
 ifeq ($(GLUON_TARGET),x86-generic)
@@ -46,7 +59,7 @@ GLUON_SITE_PACKAGES += \
 	kmod-igb
 endif
 
-DEFAULT_GLUON_RELEASE := 1.4+$(shell date '+%Y-%m-%d')
+DEFAULT_GLUON_RELEASE := 1.4+$(shell date '+%Y-%m-%d')-g.$(shell git -C $(GLUON_SITEDIR)/../ log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUON_SITEDIR) log --pretty=format:'%h' -n 1)
 
 GLUON_LANGS := de en