Version 0.8 basierend auf Gluon 2016.1.6

i18n/de.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: FFPI 1.1\n"
-"PO-Revision-Date: 2015-05-29 11:20+0100\n"
+"PO-Revision-Date: 2016-10-17 20:47+0100\n"
 "Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -12,25 +12,49 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Pinneberger "
+"Willkommen zum Einrichtungsassistenten für Deinen neuen Pinneberger "
-"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
+"Freifunk-Knoten. Fülle das folgende Formular Deinen Vorstellungen "
 "entsprechend aus und sende es ab."
 
 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 Pinneberger Freifunk-Projektes eingetragen wurde, "
-"kann sich dein Knoten mit dem Pinneberger Mesh-VPN zu verbinden. Bitte "
+"kann sich Dein Knoten mit dem Pinneberger Mesh-VPN zu verbinden. Bitte "
-"schicke dazu diesen Schlüssel und den Namen deines Knotens "
+"schicke dazu diesen Schlüssel und den Namen Deines Knotens "
 "(<em><%=hostname%></em>) an "
 "<a href=\"mailto:keys@freifunk-pinneberg.de\">keys@freifunk-pinneberg.de</a>."
-"Nach versenden der E-Mail kann es mitunter ein paar Stunden dauern bis dein Knoten sich verbindet."
+"Nach versenden der E-Mail kann es mitunter ein paar Stunden dauern bis Dein "
+"Knoten sich verbindet.</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Dein Knoten startet gerade neu und wird anschließend versuchen, "
 "sich mit anderen Freifunkknoten in seiner Nähe zu "
 "verbinden. Weitere Informationen zur "
-"Pinneberger Freifunk-Community findest du auf "
+"Pinneberger Freifunk-Community findest Du auf "
 "<a href=\"https://pinneberg.freifunk.net/\">unserer Webseite</a>.</p>"
 "<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</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"

i18n/en.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: FFPI 1.1\n"
-"PO-Revision-Date: 2015-05-29 11:20+0100\n"
+"PO-Revision-Date: 2016-10-17 20:47+0100\n"
 "Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
 "Language-Team: English\n"
 "Language: en\n"
@@ -17,11 +17,17 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"This is your Freifunk node's public key. The node won't be able to "
+"<p>This is your Freifunk node's public key. The node won't be able to "
 "connect to the mesh VPN until the key has been registered on the Freifunk "
 "Pinneberg servers. "
 "To register the key send it together with your node's name (<em><%=hostname%></em>) to "
 "<a href=\"mailto:keys@freifunk-pinneberg.de\">keys@freifunk-pinneberg.de</a>."
+"After sending the mail it can take a few hours until your node gets connected.</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
@@ -30,3 +36,21 @@ msgstr ""
 "Your can find lots of information on the Freifunk Pinneberg community on "
 "<a href=\"http://pinneberg.freifunk.net/\">our homepage</a>.</p>"
 "<p>Have fun with your node and exploring the Freifunk network!</p>"
+
+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"

site.conf

@@ -2,27 +2,40 @@
 	hostname_prefix = 'ffpi-',
 	site_name = 'Freifunk Pinneberg',
 	site_code = 'ffpi',
-	opkg_repo = 'http://1.download.services.ffpi/openwrt/barrier_breaker/14.07/%S/packages',
+	opkg = {
+		openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages',
+		extra = {
+			modules = 'http://1.download.services.ffpi/stable/modules/gluon-%GS-%GR/%S',
+		},
+	},
 	prefix4 = '10.137.0.0/16',
 	prefix6 = 'fde8:21c6:9d82::/64',
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 	ntp_servers = {'1.ntp.services.ffpi'},
 	regdom = 'DE',
 	wifi24 = {
-		ssid = 'pinneberg.freifunk.net',
 		channel = 9,
 		htmode = 'HT20',
-		mesh_ssid = '0a:00:ba:dc:ab:1e',
+		ap = {
-		mesh_bssid = '0a:00:ba:dc:ab:1e',
+			ssid = 'pinneberg.freifunk.net'
-		mesh_mcast_rate = 12000,
+		},
+		ibss = {
+			ssid = '0a:00:ba:dc:ab:1e',
+			bssid = '0a:00:ba:dc:ab:1e',
+			mcast_rate = 12000
+		},
 	},
 	wifi5 = {
-		ssid = 'pinneberg.freifunk.net',
 		channel = 40,
 		htmode = 'HT40+',
-		mesh_ssid = '0a:00:ba:dc:ab:1e',
+		master = {
-		mesh_bssid = '0a:00:ba:dc:ab:1e',
+			ssid = 'pinneberg.freifunk.net',
-		mesh_mcast_rate = 12000,
+		},
+		ibss = {
+			ssid = '0a:00:ba:dc:ab:1e',
+			bssid = '0a:00:ba:dc:ab:1e',
+			mcast_rate = 12000,
+		},
 	},
 	next_node = {
 		ip4 = '10.137.0.1',
@@ -38,26 +51,45 @@
 				peers = {
 					gate01 = {
 						key = 'bf98ec39cf0cbd895389993aade1dbfc31d7da9daf8e789c69ba9f950fcad85d',
-						remotes = {'ipv4 "gate01.hoogi.de" port 10000'},
+						remotes = {
+							'ipv4 "gate01.hoogi.de" port 10000',
+							'ipv4 "gate01.pinneberg.freifunk.net" port 10000',
+							'ipv4 "gate01.freifunk-pinneberg.de" port 10000'
+						},
 					},
 					gate03 = {
 						key = 'c7e38e8aefe35ef16cec5ea0a777f36fe9a503d06660dcd7e73727e668c1c496',
-						remotes = {'ipv4 "gate03.hoogi.de" port 10000'},
+						remotes = {
+							'ipv4 "gate03.hoogi.de" port 10000',
+							'ipv4 "gate03.pinneberg.freifunk.net" port 10000',
+							'ipv4 "gate03.freifunk-pinneberg.de" port 10000'
+						},
 					},
 					gate04 = {
 						key = 'cab16ab7a35150e554c1680feb2660a566caedb93d1786291660320dbcd298ef',
-						remotes = {'ipv4 "gate04.freifunk-pinneberg.de" port 10000'},
+						remotes = {
+							'ipv4 "gate04.pinneberg.freifunk.net" port 10000',
+							'ipv4 "gate04.freifunk-pinneberg.de" port 10000'
+						},
 					},
 					gate05 = {
 						key = '7460649437d079db4afe65b9b3949dcb173d831f5693f784ca4b5945e1b36fb9',
-						remotes = {'ipv4 "gate05.freifunk-pinneberg.de" port 10000'},
+						remotes = {
+							'ipv4 "gate05.hoogi.de" port 10000',
+							'ipv4 "gate05.pinneberg.freifunk.net" port 10000',
+							'ipv4 "gate05.freifunk-pinneberg.de" port 10000'
+						},
 					},
 				},
 			},
 		},
+		bandwidth_limit = {
+			enabled = false,
+			limit_ingress = 3000,
+			limit_egress = 200,
+		}
 	},
 	autoupdater = {
-		enabled = 'true',
 		branch = 'stable',
 		branches = {
 			stable = {
@@ -68,7 +100,7 @@
 					'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry
 					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
 					'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
-					'e3315d3b6a98884b6621d9152b276c80abe7439cf517ec831b50e25d17f947fa', -- Martin
+					'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
 				},
 			},
 			beta = {
@@ -80,7 +112,7 @@
 					'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry
 					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
 					'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
-					'e3315d3b6a98884b6621d9152b276c80abe7439cf517ec831b50e25d17f947fa', -- Martin
+					'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
 				},
 			},
 			experimental = {
@@ -92,17 +124,20 @@
 					'd9d66a1e087382d9477485a56b51e0cade3d1d80319974f12ecf2c94f910325e', -- Henry
 					'81d70b6510b9ff6eb0e35e66517e2f3ea80ff2eaa97af787565db3feb4af163f', -- Thomas
 					'73da7db80c33b035cef2d93587d29bed59a086c193e2d4a0f119b296e77f599d', -- Kevin
-					'e3315d3b6a98884b6621d9152b276c80abe7439cf517ec831b50e25d17f947fa', -- Martin
+					'ecb11b756116e478ab0450f8612fd4bfdc9306ccb95aeaa785bf1f76f40d1c2f', -- Michel
 				},
 			},
 		},
 	},
-	simple_tc = {
+	roles = {
-		mesh_vpn = {
+		default = 'node',
-			ifname = 'mesh-vpn',
+		list = {
-			enabled = false,
+			'node',
-			limit_egress = 200,
+			'temp',
-			limit_ingress = 3000,
+			'mobile',
+			'offloader',
+			'service',
+			'test',
 		},
 	},
 }

site.mk

@@ -1,7 +1,7 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
 	gluon-alfred \
-	gluon-announced \
+	gluon-respondd \
 	gluon-autoupdater \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-contact-info \
@@ -16,6 +16,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-luci-portconfig \
 	gluon-luci-wifi-config \
 	gluon-luci-private-wifi \
+	gluon-luci-node-role  \
 	gluon-next-node \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
@@ -25,7 +26,84 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged
 
-DEFAULT_GLUON_RELEASE := 0.7.1
+# basic support for USB stack
+USB_PACKAGES_BASIC := \
+	kmod-usb-core \
+	kmod-usb2
+
+# support for USB UMTS/3G devices
+USB_PACKAGES_3G := \
+	kmod-usb-serial \
+	kmod-usb-serial-wwan \
+	kmod-usb-serial-option \
+	chat \
+	ppp
+
+# support for USB GPS devices
+USB_PACKAGES_GPS := \
+	kmod-usb-acm \
+	ugps
+
+# support for HID devices (keyboard, mouse, ...)
+USB_PACKAGES_HID := \
+	kmod-usb-hid \
+	kmod-hid-generic
+
+# storage support for USB devices
+USB_PACKAGES_STORAGE := \
+	block-mount \
+	blkid \
+	kmod-fs-ext4 \
+	kmod-fs-vfat \
+	kmod-usb-storage \
+	kmod-usb-storage-extras \
+	kmod-nls-cp1250 \
+	kmod-nls-cp1251 \
+	kmod-nls-cp437 \
+	kmod-nls-cp775 \
+	kmod-nls-cp850 \
+	kmod-nls-cp852 \
+	kmod-nls-cp866 \
+	kmod-nls-iso8859-1 \
+	kmod-nls-iso8859-13 \
+	kmod-nls-iso8859-15 \
+	kmod-nls-iso8859-2 \
+	kmod-nls-koi8r \
+	kmod-nls-utf8 \
+	swap-utils
+
+# ar71xx-generic
+GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
+GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
+GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G)
+GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_3G)
+GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
+GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
+GLUON_WNDR3700_SITE_PACKAGE := $(USB_PACKAGES_BASIC)
+GLUON_WRT160NL_SITE_PACKAGE := $(USB_PACKAGES_BASIC)
+GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
+GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
+
+# mpc85xx-generic
+GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC)
+
+# x86-generic
+ifeq ($(GLUON_TARGET),x86-generic)
+GLUON_SITE_PACKAGES += \
+	$(USB_PACKAGES_HID) \
+	$(USB_PACKAGES_BASIC) \
+	$(USB_PACKAGES_STORAGE)
+endif
+
+# x86-64
+ifeq ($(GLUON_TARGET),x86-64)
+GLUON_SITE_PACKAGES += \
+	$(USB_PACKAGES_HID) \
+	$(USB_PACKAGES_BASIC) \
+	$(USB_PACKAGES_STORAGE)
+endif
+
+DEFAULT_GLUON_RELEASE := 0.8
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
@@ -33,3 +111,6 @@ GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 GLUON_PRIORITY ?= 0
 
 GLUON_LANGS ?= en de
+
+# Enable autoupdater
+GLUON_BRANCH := stable