New experimental releases

- adapted configuration to the current gluon config file format
- Add package fastd-traffic-status

i18n/de.po

@@ -19,11 +19,16 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem "
+"<p>Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem "
 "er auf den Servern des Helgoländer Freifunk-Projektes eingetragen wurde, "
 "kann sich dein Knoten mit dem Helgoländer Mesh-VPN verbinden. "
 "Bitte trage dazu diesen Schlüssel, den Namen deines Knotens (<em><%=hostname%></em>) und ein paar andere Informationen unter "
-"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=hostname%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a> ein."
+"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=hostname%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a> ein.</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

i18n/en.po

@@ -21,12 +21,16 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"This is the public key for your Freifunk node. You can only "
+"<p>This is the public key for your Freifunk node. You can only "
 "connect the node to the Helgoland mesh VPN after the key has been registered on "
 "the Freifunk Helgoland servers. "
 "Please register your key, the name of your node (<em><%=hostname%></em>), and a bit of additional info at "
-"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=hostname%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a>."
+"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=hostname%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a>.</p>"
-
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

modules

@@ -1,4 +1,4 @@
 GLUON_SITE_FEEDS='ffhh_packages'
 
 PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
-PACKAGES_FFHH_PACKAGES_COMMIT=818765060bc76a109dde1558513fd086e5973ef1
+PACKAGES_FFHH_PACKAGES_COMMIT=0a70ceb1c636a5a21ce47e39513031e3794daea2

site.conf

@@ -2,7 +2,13 @@
 	hostname_prefix = 'GibMirEinenNamen',
 	site_name = 'Freifunk Helgoland',
 	site_code = 'helgo',
-	opkg_repo = 'http://opkg.services.helgo/barrier_breaker/14.07/%S/packages',
+
+	opkg = {
+		openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages',
+		extra = {
+			modules = 'http://updates.helgoland.freifunk.net/experimental/modules/gluon-%GS-%GR/%S',
+		},
+	},
 
 	prefix4 = '10.189.0.0/18',
 	prefix6 = '2a03:2267:4e16:01ad::/64',
@@ -12,20 +18,35 @@
 	regdom = 'DE',
 
 	wifi24 = {
-		ssid = 'helgoland.freifunk.net',
 		channel = 1,
-		htmode = 'HT20',
+		ap = {
-		mesh_ssid = '14:cc:20:92:0f:e9',
+			ssid = 'helgoland.freifunk.net',
-		mesh_bssid = '14:cc:20:92:0f:e9',
+		},
-		mesh_mcast_rate = 12000,
+		ibss = {
+			ssid = '14:cc:20:92:0f:e9',
+			bssid = '14:cc:20:92:0f:e9',
+			mcast_rate = 12000,
+		},
+		--[[ mesh = {
+			id = 'ff-helgo-mesh',
+			mcast_rate = 12000,
+		}, --]]
 	},
+
 	wifi5 = {
-		ssid = 'helgoland.freifunk.net',
 		channel = 44,
-		htmode = 'HT40+',
+		ap = {
-		mesh_ssid = '14:cc:20:92:0f:e9',
+			ssid = 'helgoland.freifunk.net',
-		mesh_bssid = '14:cc:20:92:0f:e9',
+		},
-		mesh_mcast_rate = 12000,
+		ibss = {
+			ssid = '14:cc:20:92:0f:e9',
+			bssid = '14:cc:20:92:0f:e9',
+			mcast_rate = 12000,
+		},
+		--[[ mesh = {
+			id = 'ff-helgo-mesh',
+			mcast_rate = 12000,
+		}, --]]
 	},
 
 	next_node = {
@@ -61,6 +82,11 @@
 				},
 			},
 		},
+		bandwidth_limit = {
+			enabled = false,
+			ingress = 8192,
+			egress = 768,
+		},
 	},
 
 	autoupdater = {
@@ -96,13 +122,4 @@
 			},
 		},
 	},
-
-	simple_tc = {
-		mesh_vpn = {
-			ifname = 'mesh-vpn',
-			enabled = false,
-			limit_egress = 768,
-			limit_ingress = 8192,
-		},
-	},
 }

site.mk

@@ -19,13 +19,14 @@ GLUON_SITE_PACKAGES := \
 	gluon-radvd \
 	gluon-setup-mode \
 	gluon-status-page \
+	fastd-traffic-status \
 	iwinfo \
 	iptables \
 	haveged
 
 
 
-DEFAULT_GLUON_RELEASE := 0.7.1
+DEFAULT_GLUON_RELEASE := 0.8~exp$(shell date '+%Y%m%d')
 # for experimental firmware:
 # DEFAULT_GLUON_RELEASE := 0.6+exp$(shell date '+%Y%m%d')