Merge branch 'feature/2017.1.x' into feature/remove_vpn-schluessel-ml-hinweis

README.md

@@ -7,6 +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 (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

@@ -26,7 +26,7 @@ msgstr ""
 "Wenn sich dein Knoten NICHT mit den Mesh-VPNs in Stuttgart verbinden kann, "
 "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

@@ -25,7 +25,7 @@ msgstr ""
 "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',
@@ -29,11 +30,6 @@
             id = 'ffsmesh_batman',
             mcast_rate = 12000,
         },
-        ibss = {
-            ssid = '02:04:08:16:32:64',
-            bssid = '02:04:08:16:32:64',
-            mcast_rate = 12000,
-        },
     },
 
     wifi5 = {
@@ -45,11 +41,6 @@
             id = 'ffsmesh_batman',
             mcast_rate = 12000,
         },
-        ibss = {
-            ssid = '02:04:08:16:32:64',
-            bssid = '02:04:08:16:32:64',
-            mcast_rate = 12000,
-        },
     },
 
 
@@ -59,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,
@@ -138,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 \
 	gluon-respondd \
 	gluon-autoupdater \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-contact-info \
+	gluon-mesh-batman-adv-15 \
+	gluon-mesh-vpn-fastd \
 	gluon-config-mode-core \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
 	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-private-wifi \
 	gluon-neighbour-info \
-	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-setup-mode \
 	gluon-status-page \
@@ -46,7 +50,7 @@ GLUON_SITE_PACKAGES += \
 	kmod-igb
 endif
 
-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)
+DEFAULT_GLUON_RELEASE := 1.4+$(shell date '+%Y-%m-%d')-$(GLUON_RELEASE)-s.$(shell git -C $(GLUON_SITEDIR) log --pretty=format:'%h' -n 1)
 
 GLUON_LANGS := de en