Batman Kompatibilitätsmodus 15 für neues Gateway, sowie Rollen

README.md

@@ -11,6 +11,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Helgoland Freifunk Firmware builds
 
+- 0.9:    v2016.2.7 with batman_adv compat v15
 - 0.8.2:  v2016.2.7 new keys for new infrastructure
 - 0.8.1:  v2016.2.3
 - 0.8:    v2016.1.2

i18n/de.po

@@ -25,6 +25,7 @@ msgstr ""
 "<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 übermittle den Schlüssel an die Administration der Helgoländer Community. "
 "<div class=\"the-key\">"
 " # <%= escape(hostname) %>"
 " <br/>"
@@ -44,3 +45,24 @@ msgstr ""
 "<p>Eine Eintragung deines Knotens ist nicht erforderlich. Den Namen und "
 "die Koordinaten kannst du im Config-Mode jederzeit selber ändern. "
 "Die Informationen werden dann automatisch in die Karte übernommen.</p>"
+
+msgid "gluon-luci-node-role:role:node"
+msgstr "Normaler Knoten"
+
+msgid "gluon-luci-node-role:role:temp"
+msgstr "Knoten nicht 24/7 verfügbar"
+
+msgid "gluon-luci-node-role:role:mobile"
+msgstr "Mobiler Knoten"
+
+msgid "gluon-luci-node-role:role:offloader"
+msgstr "VPN Offloader"
+
+msgid "gluon-luci-node-role:role:service"
+msgstr "Knoten für Dienste"
+
+msgid "gluon-luci-node-role:role:test"
+msgstr "Knoten für Tests"
+
+msgid "gluon-luci-node-role:role:hidden"
+msgstr "Unsichtbarer Knoten"

i18n/en.po

@@ -17,15 +17,14 @@ msgstr ""
 "You're free to choose your own node name in the field below, so "
 "come up with something nice. This will be the name of the node in "
 "the network and has nothing to do with the broadcast network name (SSID). "
-"The latter is always helgoland.freifunk.net."
+"The latter is always <tt>helgoland.freifunk.net</tt>."
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 "<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><%=escape(hostname)%></em>), and a bit of additional info at "
+"Please transfer your key to the administration of our community. "
-"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=escape(hostname)%>&key=<%=pubkey%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a>.</p>"
 "<div class=\"the-key\">"
 " # <%= escape(hostname) %>"
 " <br/>"
@@ -42,7 +41,25 @@ msgstr ""
 
 msgid "gluon-config-mode:nopubkey"
 msgstr ""
-"Please enter the name of your node "
+"A node registration is not needed. Everything works automatically. Have fun! "
-"(<em><%=escape(hostname)%></em>) and some additional information at "
+
-"<a href=\"http://formular.helgoland.freifunk.net/#/new?hostname=<%=escape(hostname)%>&mac=<%= sysconfig.primary_mac %>\" target=\"_blank\">http://formular.helgoland.freifunk.net/</a> "
+msgid "gluon-luci-node-role:role:node"
-"."
+msgstr "Normal Node"
+
+msgid "gluon-luci-node-role:role:temp"
+msgstr "Node not available 24/7"
+
+msgid "gluon-luci-node-role:role:mobile"
+msgstr "Mobile Node"
+
+msgid "gluon-luci-node-role:role:offloader"
+msgstr "VPN Offloader"
+
+msgid "gluon-luci-node-role:role:service"
+msgstr "Service Node"
+
+msgid "gluon-luci-node-role:role:test"
+msgstr "Test Node"
+
+msgid "gluon-luci-node-role:role:hidden"
+msgstr "Hidden Node"

site.conf

@@ -114,4 +114,16 @@
 		},
 	},
 	poe_passthrough = false,
+	roles = {
+		default = 'node',
+		list = {
+			'node',
+			'temp',
+			'mobile',
+			'offloader',
+			'service',
+			'test',
+			'hidden',
+		},
+	},
 }

site.mk

@@ -1,5 +1,5 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-14 \
+	gluon-mesh-batman-adv-15 \
 	gluon-alfred \
 	gluon-autoupdater \
 	gluon-config-mode-autoupdater \
@@ -8,7 +8,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-hostname \
 	gluon-config-mode-mesh-vpn \
-	gluon-config-mode-reboot-ffhh \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-ebtables-segment-mld \
@@ -17,6 +16,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-luci-portconfig \
 	gluon-luci-private-wifi \
 	gluon-luci-wifi-config \
+	gluon-luci-node-role \
 	gluon-next-node \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
@@ -27,11 +27,7 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged
 
-
+DEFAULT_GLUON_RELEASE := 0.9
-
-DEFAULT_GLUON_RELEASE := 0.8.2
-# for experimental firmware:
-# DEFAULT_GLUON_RELEASE := 0.6+exp$(shell date '+%Y%m%d')
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)