Update to actual master

i18n/de.po

@@ -31,6 +31,12 @@ msgstr ""
 "an <a href=\"mailto:kontakt@hochstift.freifunk.net\">kontakt@hochstift.freifunk.net</a> oder benutze am besten gleich das "
 "<a href=\"http://hochstift.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>&email=<%=contact%>\"> "
 "vorausgefüllte Formular auf unserer Webseite</a>.<br><br>"
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

i18n/en.po

@@ -30,6 +30,12 @@ msgstr ""
 "<a href=\"http://hochstift.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>&email=<%=contact%>\">this form</a> "
 "or send it together with your node's name (<em><%=hostname%></em>) to "
 "<a href=\"mailto:kontakt@hochstift.freifunk.net\">kontakt@hochstift.freifunk.net</a>."
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

modules

@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffho-packages.git
-PACKAGES_FFHO_BRANCH=v2015.1.x
-PACKAGES_FFHO_COMMIT=50de06d4e36bf895f7a2d888455982d5c88bc681
+PACKAGES_FFHO_BRANCH=master
+PACKAGES_FFHO_COMMIT=d26e3d097993a4b4625d75d6a47048306f5c2584

site.conf

@@ -26,7 +26,9 @@
 	ntp_servers = {'ntp.in.ffho.net'},
 
 	-- OpenWRT Package Repository (IPv6 capable)
-	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/barrier_breaker/14.07/%S/packages/',
+	opkg = {
+		openwrt = 'http://bo.mirror.garr.it/pub/1/openwrt/barrier_breaker/14.07/%S/packages/',
+	}
 
 	-- regulatory domain of your wifi
 	regdom = 'DE',
@@ -36,20 +38,32 @@
 	-- mesh_ssid = 'ffho-mesh-${un-code}',
 	-- mesh_bssid = '${idividual-mac}'
 	wifi24 = {
-		ssid = 'paderborn.freifunk.net',
 		channel = 1,
 		htmode = 'HT20',
-		mesh_ssid = '02:d1:11:13:87:ad',
-		mesh_bssid = '02:d1:11:13:87:ad',
-		mesh_mcast_rate = 12000,
+
+		ap = {
+			ssid = 'paderborn.freifunk.net',
+		},
+		
+		ibss = {
+			mesh_ssid = '02:d1:11:13:87:ad',
+			mesh_bssid = '02:d1:11:13:87:ad',
+			mesh_mcast_rate = 12000,
+		},
 	},
 	wifi5 = {
-		ssid = 'paderborn.freifunk.net',
 		channel = 44,
 		htmode = 'HT40+',
-		mesh_ssid = '02:d1:11:13:87:ad',
-		mesh_bssid = '02:d1:11:13:87:ad',
-		mesh_mcast_rate = 12000,
+
+		ap = {
+			ssid = 'paderborn.freifunk.net',
+		},
+
+		ibss = {
+			mesh_ssid = '02:d1:11:13:87:ad',
+			mesh_bssid = '02:d1:11:13:87:ad',
+			mesh_mcast_rate = 12000,
+		},
 	},
 
 	-- IP address of each router
@@ -152,6 +166,15 @@
 				},
 			},
 		},
+
+		-- default traffic shaping (bandwidth limit) settings
+		bandwidth_limit = {
+			enabled = false,
+			limit_egress = 200,
+			limit_ingress = 3000,
+		},
+
+
 	},
 
 	-- configure the autoupdater
@@ -212,16 +235,6 @@
 		},
 	},
 
-	-- default traffic shaping (bandwidth limit) settings
-	simple_tc = {
-		mesh_vpn = {
-			ifname = 'mesh-vpn',
-			enabled = false,
-			limit_egress = 200,
-			limit_ingress = 3000,
-		},
-	},
-
 	-- configure ffho-debug
 	debugserver = {
 		host = { 'debugreport.ffho.net', 'fdca:ffee:ff12:a254::deb9' },

site.mk

@@ -33,7 +33,7 @@ GLUON_SITE_PACKAGES := \
 
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 0.6.5~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.7.0~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)