Support for v2015.2 (master branch, in development)

Dockerfile

@@ -1,14 +1,14 @@
 FROM debian:jessie
 MAINTAINER Markus Lindenberg <markus@lindenberg.io>
 
-ENV GLUON_TAG v2015.1.2
+ENV GLUON_TAG master
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_PRIORITY critical
 ENV DEBCONF_NOWARNINGS yes
 
 RUN apt-get update
-RUN apt-get -y install --no-install-recommends ca-certificates python wget file git subversion build-essential gawk unzip libncurses5-dev zlib1g-dev && apt-get clean
+RUN apt-get -y install --no-install-recommends ca-certificates python wget file git subversion build-essential gawk unzip libncurses5-dev zlib1g-dev openssl libssl-dev && apt-get clean
 
 
 ADD docker/build.sh /usr/src/build.sh

docker/build.sh

@@ -15,7 +15,7 @@ cp -r /usr/src/i18n gluon/site/
 # Build
 cd gluon
 make update
-time make -j $(($(nproc)+1)) BROKEN=1 GLUON_TARGET=ar71xx-generic
+time make -j $(($(nproc)+1)) V=s BROKEN=1 GLUON_TARGET=ar71xx-generic
 
 set +x
 echo -e "\nBUILD FINISHED\n"

i18n/de.po

@@ -19,9 +19,16 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
+"<p>"
 "Dies ist der &ouml;ffentliche Schl&uuml;ssel deines Freifunk-Knotens zur Information."
 "Der Knoten ist nun direkt nutzbar."
 "Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken."
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

i18n/en.po

@@ -17,7 +17,14 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
+"<p>"
 "This is your Freifunk node's public key. You can use your node right away."
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

site.conf

@@ -2,7 +2,6 @@
 	hostname_prefix = 'FF-DO',
 	site_name = 'Freifunk Dortmund',
 	site_code = 'ffdo',
-	opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
 
 	prefix4 = '10.233.0.0/16',
 	prefix6 = '2a03:2260:50:5::/64',
@@ -11,21 +10,32 @@
 	ntp_servers = {'1.ntp.services.ffdo.de','2.ntp.services.ffdo.de','3.ntp.services.ffdo.de', '4.ntp.services.ffdo.de'},
 	regdom = 'DE',
 
+	opkg = {
+		openwrt = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+	},
+
 	wifi24 = {
-		ssid = 'Freifunk',
 		channel = 1,
-		htmode = 'HT40+',
-		mesh_ssid = 'wifimesh-dortmund',
-		mesh_bssid = '02:ff:d0:09:ff:01',
-		mesh_mcast_rate = 12000,
+		ap = {
+			ssid = 'Freifunk',
+		},
+		ibss = {
+			ssid = 'wifimesh-dortmund',
+			bssid = '02:ff:d0:09:ff:01',
+			mesh_mcast_rate = 12000,
+		},
 	},
+
 	wifi5 = {
-		ssid = 'Freifunk (5GHz)',
 		channel = 44,
-		htmode = 'HT40+',
-		mesh_ssid = 'wifimesh-dortmund5',
-		mesh_bssid = '02:ff:d0:09:ff:02',
-		mesh_mcast_rate = 12000,
+		ap = {
+			ssid = 'Freifunk (5GHz)',
+		},
+		ibss = {
+			ssid = 'wifimesh-dortmund5',
+			bssid = '02:ff:d0:09:ff:02',
+			mcast_rate = 12000,
+		},
 	},
 
 	next_node = {
@@ -69,6 +79,11 @@
 				peers = {},
 			},
 		},
+		bandwidth_limit = {
+			enabled = false,
+			egress = 4000,
+			ingress = 30000,
+		},
 	},
 
 	autoupdater = {
@@ -106,13 +121,4 @@
 			},
 		},
 	},
-
-	simple_tc = {
-		mesh_vpn = {
-			ifname = 'mesh-vpn',
-			enabled = false,
-			limit_egress = 4000,
-			limit_ingress = 30000,
-		},
-	},
 }

site.mk

@@ -26,13 +26,13 @@ GLUON_SITE_PACKAGES := \
         haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.7.2
+DEFAULT_GLUON_RELEASE := 0.7.2.1
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 
 GLUON_PRIORITY ?= 0
-GLUON_BRANCH ?= stable
+GLUON_BRANCH ?= experimental
 export GLUON_BRANCH
 
 GLUON_TARGET ?= ar71xx-generic