Merge branch 'testing' into stable

extra/default.conf

@@ -7,4 +7,5 @@ subst = {
 	['%%V4'] = '10.132.112.0/21',
 	['%%V6'] = 'a00',
 	['%%N4'] = '10.132.112.1',
+	['%%DS'] = '6fdb7c99404fe91fca18e84bf48864681018741dc33fb6bde67d6041fc99210c',
 }

extra/groups.conf

@@ -5,6 +5,7 @@
 			['%%V4'] = '10.132.32.0/20',
 			['%%V6'] = '100',
 			['%%N4'] = '10.132.32.1',
+			['%%DS'] = '346fe028635137fa012d2e7ef4c30c1998d988636d358c929559616e24f4f6bc',
 		},
 	},
 	pad_uml = {
@@ -13,6 +14,7 @@
 			['%%V4'] = '10.132.48.0/21',
 			['%%V6'] = '200',
 			['%%N4'] = '10.132.48.1',
+			['%%DS'] = '4d6ebfb6c5ac1507a7a9bd4b40c1e84f7f750db29a33ca721009f3d0e9b1569e',
 		},
 	},
 	buq = {
@@ -21,6 +23,7 @@
 			['%%V4'] = '10.132.56.0/21',
 			['%%V6'] = '300',
 			['%%N4'] = '10.132.56.1',
+			['%%DS'] = 'f57ae6294491f9b58cf2183dda44927a0b33f825156da68b05302dd8a0cc08b6',
 		},
 	},
 	pb_nord = {
@@ -29,6 +32,7 @@
 			['%%V4'] = '10.132.64.0/21',
 			['%%V6'] = '400',
 			['%%N4'] = '10.132.64.1',
+			['%%DS'] = '59452bf36c5614022c54fe9f5b4a0012da07a25d455b99079db0758b2fd748c8',
 		},
 	},
 	pb_ost = {
@@ -37,6 +41,7 @@
 			['%%V4'] = '10.132.72.0/21',
 			['%%V6'] = '500',
 			['%%N4'] = '10.132.72.1',
+			['%%DS'] = 'ff018701d9378be833e6bcd2b38791f785cdeb41dcfa15255069d83a090f7a60',
 		},
 	},
 	pb_sued = {
@@ -45,6 +50,7 @@
 			['%%V4'] = '10.132.80.0/21',
 			['%%V6'] = '600',
 			['%%N4'] = '10.132.80.1',
+			['%%DS'] = '23598bf0196a7650428717c5ecd4cf6f3062271ed1020c86711176adffbcdc3b',
 		},
 	},
 	pb_west = {
@@ -53,6 +59,7 @@
 			['%%V4'] = '10.132.88.0/21',
 			['%%V6'] = '700',
 			['%%N4'] = '10.132.88.1',
+			['%%DS'] = '1b8bed9940f072b2ad3ab51a97868c4f4346d73d7a7e41fee5954f0f67905e0c',
 		},
 	},
 	hx_nord = {
@@ -61,6 +68,7 @@
 			['%%V4'] = '10.132.96.0/21',
 			['%%V6'] = '800',
 			['%%N4'] = '10.132.96.1',
+			['%%DS'] = 'a98d1fdc66bf8b952937183edf9d8a581ee375c09f30eb902deecea5d4036b1a',
 		},
 	},
 	hx_sued = {
@@ -69,6 +77,7 @@
 			['%%V4'] = '10.132.104.0/21',
 			['%%V6'] = '900',
 			['%%N4'] = '10.132.104.1',
+			['%%DS'] = '936f9b7ec3988901fc9f314958e923e9af7ac1f47234df27cc5fc5305ab973c0',
 		},
 	},
 	uml = {
@@ -77,6 +86,7 @@
 			['%%V4'] = '10.132.112.0/21',
 			['%%V6'] = 'a00',
 			['%%N4'] = '10.132.112.1',
+			['%%DS'] = '47ab039f19c4865701a4d4f5123109ee4c340808b03d1261e596283206b2ebc2',
 		},
 	},
 }

extra/template.conf

@@ -12,6 +12,13 @@
 	-- site_code = 'ffho_${un-code}'
 	site_code = '%SC',
 
+	-- 32 bytes of random data, encoded in hexadecimal, used to seed other 
+	-- random values specific to the mesh domain. It must be the same for all 
+	-- nodes of one mesh, but should be different for firmwares that are not 
+	-- supposed to mesh with each other.
+	-- TODO: Must be set individual by any domain
+	domain_seed = '%DS',
+
 	-- v4 and v6 prefixes in which nodes+clients might get an IP
 	prefix4 = '%V4',
 	prefix6 = '2a03:2260:2342:%V6::/64',
@@ -24,15 +31,20 @@
 
 	-- OpenWRT Package Repository (IPv6 capable)
 	opkg = {
-		openwrt = 'http://firmware.srv.in.ffho.net/openwrt/%n/%v/%S/packages',
+		lede = 'http://firmware.srv.in.ffho.net/lede/packages-%v/%A',
 		extra = {
-			modules = 'http://firmware.srv.in.ffho.net/%GR/modules/%S',
+			gluon = 'http://firmware.srv.in.ffho.net/%GR/modules/%S',
 		},
 	},
 
 	-- regulatory domain of your wifi
 	regdom = 'DE',
 
+	mesh = {
+		-- for now, we don't use vxlan on the mesh
+		vxlan = false,
+	},
+
 	-- wifi settings (2.4 GHz and 5 GHz)
 	-- ap.ssid = 'hochstift.freifunk.net/${kürzel}',
 	-- mesh.id = 'ffho-mesh-${group-name}',
@@ -67,78 +79,79 @@
 	next_node = {
 		ip4 = '%N4',
 		ip6 = '2a03:2260:2342:%V6::1',
+		name = { 'node.ffho.net' },
 
 		-- mac address, must be unique in the client network
 		-- (usually, you don't need to change this)
 		mac = 'f2:ff:ff:%ID:ff:ff',
 	},
 
-	-- fastd (vpn) settings
-	fastd_mesh_vpn = {
-		-- cipher(s) to use
-		methods = {'salsa2012+umac'},
-
+	mesh_vpn = {
 		-- the maximum transfer unit
 		mtu = 1406,
 
-		groups = {
-			backbone = {
-				-- specifies how many servers are contacted
-				-- by a client simultanously
-				limit = 1,
-
-				-- list all available vpn servers
-				peers = {
-					gw01 = {
-						-- public fastd key of the vpn server
-						key = '97bc56ae561f67cfe15364134868c3553b5f1eab06f7bd9c5b93fbf280a52b51',
-						-- remotes is an array of ways on how to reach the VPN server
-						-- Use public addresses here, these addresses are used when the mesh might not be connected yet.
-						-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
-						remotes = {
-							'"gw01.ffho.net" port 100%ID',
-							'ipv6 "2001:830:c:9::12" port 100%ID',
-							'ipv4 "80.242.130.70" port 100%ID',
+		-- fastd (vpn) settings
+		fastd = {
+			-- cipher(s) to use
+			methods = {'salsa2012+umac'},
+
+			groups = {
+				backbone = {
+					-- specifies how many servers are contacted
+					-- by a client simultanously
+					limit = 1,
+
+					-- list all available vpn servers
+					peers = {
+						gw01 = {
+							-- public fastd key of the vpn server
+							key = '97bc56ae561f67cfe15364134868c3553b5f1eab06f7bd9c5b93fbf280a52b51',
+							-- remotes is an array of ways on how to reach the VPN server
+							-- Use public addresses here, these addresses are used when the mesh might not be connected yet.
+							-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
+							remotes = {
+								'"gw01.ffho.net" port 100%ID',
+								'ipv6 "2001:830:c:9::12" port 100%ID',
+								'ipv4 "80.242.130.70" port 100%ID',
+							},
 						},
-					},
-					gw02 = {
-						key = 'e8fa9bf402fd33dd1ba804a97f2e46c704423ff49e9c55312845a7bfb93121ad',
-						remotes = {
-							'"gw02.ffho.net" port 100%ID',
-							'ipv6 "2a01:4f8:190:6500::18:1" port 100%ID',
-							'ipv4 "78.46.242.24" port 100%ID',
+						gw02 = {
+							key = 'e8fa9bf402fd33dd1ba804a97f2e46c704423ff49e9c55312845a7bfb93121ad',
+							remotes = {
+								'"gw02.ffho.net" port 100%ID',
+								'ipv6 "2a01:4f8:190:6500::18:1" port 100%ID',
+								'ipv4 "78.46.242.24" port 100%ID',
+							},
 						},
-					},
-					gw03 = {
-						key = '629b2742922f068ef49558283aea4b75c1427d8cdd3fcd2dbd7c00880547d3b3',
-						remotes = {
-							'"gw03.ffho.net" port 100%ID',
-							'ipv6 "2a00:13c8:1000:2::165" port 100%ID',
-							'ipv4 "185.46.137.165" port 100%ID',
+						gw03 = {
+							key = '629b2742922f068ef49558283aea4b75c1427d8cdd3fcd2dbd7c00880547d3b3',
+							remotes = {
+								'"gw03.ffho.net" port 100%ID',
+								'ipv6 "2a00:13c8:1000:2::165" port 100%ID',
+								'ipv4 "185.46.137.165" port 100%ID',
+							},
 						},
-					},
-					gw04 = {
-						key = 'cf3855e5fa04e4c04a294cb6e8902f91c7ff7ef82bf031cc842a2b79b936677c',
-						remotes = {
-							'"gw04.ffho.net" port 100%ID',
-							'ipv6 "2a02:450:1::22" port 100%ID',
-							'ipv4 "80.70.181.63" port 100%ID',
+						gw04 = {
+							key = 'cf3855e5fa04e4c04a294cb6e8902f91c7ff7ef82bf031cc842a2b79b936677c',
+							remotes = {
+								'"gw04.ffho.net" port 100%ID',
+								'ipv6 "2a02:450:1::22" port 100%ID',
+								'ipv4 "80.70.181.63" port 100%ID',
+							},
 						},
-					},
-					gw05 = {
-						key = 'd0d32a2f536a0fc1f0c848e6da15bd96851d5ff4fdf9239c830bab033ddcec1a',
-						remotes = {
-							'"gw05.ffho.net" port 100%ID',
-							'ipv6 "2001:638:502:1884::ff15" port 100%ID',
-							'ipv4 "192.26.175.183" port 100%ID',
+						gw05 = {
+							key = 'd0d32a2f536a0fc1f0c848e6da15bd96851d5ff4fdf9239c830bab033ddcec1a',
+							remotes = {
+								'"gw05.ffho.net" port 100%ID',
+								'ipv6 "2001:638:502:1884::ff15" port 100%ID',
+								'ipv4 "192.26.175.183" port 100%ID',
+							},
 						},
-					},
-					gw06 = {
-						key = '88b570c4cc811259b7c4106943098c9bee1126d692ddacedd23cd48efc28b0bf',
-						remotes = {
-							'"gw06.ffho.net" port 100%ID',
-							'ipv6 "2001:41d0:a:377a::54" port 100%ID',
-							'ipv4 "5.196.106.54" port 100%ID',
+						gw06 = {
+							key = '88b570c4cc811259b7c4106943098c9bee1126d692ddacedd23cd48efc28b0bf',
+							remotes = {
+								'"gw06.ffho.net" port 100%ID',
+							},
 						},
 					},
 				},
@@ -177,7 +190,7 @@
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
+					'88d25b1abafe262cd3653ed573b9917eee48a62ceb30e405c051b0ea320c382f', -- KnicklichtJedi
 					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
 				},
 			},
@@ -189,7 +202,7 @@
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
+					'88d25b1abafe262cd3653ed573b9917eee48a62ceb30e405c051b0ea320c382f', -- KnicklichtJedi
 					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
 				},
 			},
@@ -201,44 +214,33 @@
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
 					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
 					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-					'9841dde0b9f6485d5fcdc858fb15c1db1c3bc77fb81aef3f0d4b835f76a3d73b', -- kb-light
+					'88d25b1abafe262cd3653ed573b9917eee48a62ceb30e405c051b0ea320c382f', -- KnicklichtJedi
 					'39ef16b1853e54249dae2d06948329a93e3e13f354aaab792552aacd1d0b45ba', -- phimeas
 				},
 			},
 		},
 	},
 
-	-- configure ffho-debug
-	debugserver = {
-		host = { 'debugreport.ffho.net', '2a01:a700:4621:d102::10' },
-		port = 1337,
-	},
-
-	-- enable BATMAN on WAN interface by default (requires gluon-batman-on-wan package)
-	batman_on_wan = 0,
-
 	config_mode = {
+		-- Show/hide the altitude field
 		geo_location = {
 			show_altitude = false,
+			osm = {
+				center = {
+					lat = 51.695543946,
+					lon = 8.958663940,
+				},
+				zoom = 11,
+			},
 		},
+		-- define if the contact field is obligatory (optional)
 		owner = {
 			obligatory = false,
 		},
 	},
 
-	-- link to map
-	status_page = {
-		location_link = 'https://map.hochstift.freifunk.net/#/de/map/',
-	},
-
-	-- geo-default site
-	site_select = {
-		geo_default_site = 'ffho_yho',
-	},
-
-	ath9k_workaround = {
-		blackout_wait = 60,
-		reset_wait = 300,
-		step_size = 10,
+	-- configure DNS forwarding
+	dns = {
+		servers = { '2a03:2260:2342:f251::53' },
 	},
 }

i18n/de.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-11-02 13:15+0100\n"
+"PO-Revision-Date: 2017-06-25 11:55+0200\n"
 "Last-Translator: Freifunk Hochstift <kontakt@hochstift.freifunk.net>\n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -18,57 +18,40 @@ msgstr ""
 
 msgid "gluon-config-mode:site-select"
 msgstr ""
-"Hier hast du die Möglichkeit die Region, in der sich dein "
+"Hier hast du die Möglichkeit, die Region, in der sich dein "
 "Knoten befindet, auszuwählen. Bitte denke daran, dass dein Router "
 "sich nur mit dem Netz der ausgewählten Region verbindet."
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem "
+"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem "
 "er auf den Servern des Freifunk Hochstift-Projektes eingetragen wurde, "
 "kann sich dein Knoten mit dem Mesh-VPN verbinden. Bitte "
 "schicke dazu diesen Schlüssel und den Namen deines Knotens "
-"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=<%=urlescape(pubkey)%>&nname=<%=urlescape(hostname)%>&mac=<%=urlescape(sysconfig.primary_mac)%>&email=<%=urlescape(contact or '')%>\"> "
-"vorausgefüllte Formular auf unserer Webseite</a>.<br><br>"
+"an <a href=\"mailto:kontakt@hochstift.freifunk.net?subject=<%= urlencode('new node \'' .. hostname .. '\'') %>&amp;"
+"body=<%= urlencode(hostname .. '\n\n# Owner: ') %><%= urlencode(contact or '\n') %><%= urlencode('\n# MAC: ' .. sysconfig.primary_mac .. '\nkey \"' .. pubkey .. '\";\n\nDeine Nachricht:\n') %>\">kontakt@hochstift.freifunk.net</a> oder benutze das "
+"<a href=\"https://hochstift.freifunk.net/neuen-knoten-eintragen/?key=<%= pubkey %>&amp;nname=<%= urlencode(hostname) %>&amp;mac=<%= urlencode(sysconfig.primary_mac) %>&amp;email=<%= urlencode(contact or '') %>\"> "
+"vorausgefüllte Formular auf unserer Webseite</a>."
 "</p>"
 "<div class=\"the-key\">"
-"<%=escape(hostname)%><br/><br/>"
-"# Owner: <%=escape(contact or '')%><br/>"
-"# MAC: <%=escape(sysconfig.primary_mac)%><br/>"
-"key \"<%=escape(pubkey)%>\";"
+"<%= pcdata(hostname) %><br/><br/>"
+"# Owner: <%= pcdata(contact) %><br/>"
+"# MAC: <%= pcdata(sysconfig.primary_mac) %><br/>"
+"key \"<%= pubkey %>\";"
 "</div>"
 
+msgid "gluon-config-mode:novpn"
+msgstr ""
+"<p>Du hast ausgewählt, kein Mesh-VPN zu nutzen. "
+"Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
+"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
+"</p>"
+
 msgid "gluon-config-mode:reboot"
 msgstr ""
-"<p> "
-"Dein Knoten startet gerade neu und wird anschließend versuchen, "
-"sich anschließend mit anderen Freifunkknoten in seiner Nähe zu "
-"verbinden. Weitere Informationen zur  "
-"Freifunk Hochstift-Community findest du auf  "
-"<a href=\"http://hochstift.freifunk.net/\">unserer Webseite</a>. "
-"</p> "
-"<p> "
-"Viel Spaß mit deinem Knoten und der Erkundung von Freifunk! "
-"</p> "
-"<p> "
-"Abschließend möchten wir dir noch die Nutzungsbedingungen ans  "
-"Herz legen. Bitte beachte sie. "
-"</p> "
-"<h1>Nutzungsbedingunen</h1> "
-"Freifunk ist komplett von seinen Benutzern geschaffen worden, es gibt keine  "
-"mächtige Instanz, die über das Netz herrscht. Jeder Anwender ist zum gleichen  "
-"Teil an dem Projekt beteiligt. Die Beteiligten betreiben das Netzwerk auf  "
-"eigene Kosten und dies ist nur möglich, wenn sich alle an ein paar Regeln  "
-"halten:<br><br> "
-"<b>Sei Fair!</b><br> "
-"Das Netzwerk darf nicht in einer Weise beansprucht werden die das Netzwerk  "
-"selbst, dessen Betreibende oder andere Teilnehmende beeinträchtigt.<br><br> "
-"<b>Achte auf deine Sicherheit!</b><br> "
-"Das Netzwerk ist, wie das Internet, unverschlüsselt und offen. Jede  "
-"teilnehmende Person ist selbst für die Sicherheit ihrer Verbindungen und  "
-"ihrer Endgeräte verantwortlich.<br><br> "
-"<b>Keine rechtswidrige Nutzung!</b><br> "
-"Das Netzwerk darf nicht für Handlungen missbraucht werden, welche gesetzliche "
-"Bestimmungen oder die Rechte Dritter verletzen. Es dürfen keine Inhalte "
-"übertragen werden, welche gegen geltendes Recht verstoßen. "
+"<p>Dein Knoten startet gerade neu und wird anschließend versuchen, "
+"sich mit anderen Freifunkknoten in seiner Nähe zu verbinden. "
+"Weitere Informationen zur Freifunk Hochstift-Community findest du auf  "
+"<a href=\"https://hochstift.freifunk.net/\">unserer Webseite</a>."
+"</p>"
+"<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"

i18n/en.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-11-02 13:15+0100\n"
+"PO-Revision-Date: 2017-06-25 12:20+0200\n"
 "Last-Translator: Freifunk Hochstift <kontakt@hochstift.freifunk.net>\n"
 "Language-Team: English\n"
 "Language: en\n"
@@ -23,25 +23,35 @@ 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 "
 "Hochstift servers. "
-"To register the key fill out "
-"<a href=\"http://hochstift.freifunk.net/?page_id=366&key=<%=urlescape(pubkey)%>&nname=<%=urlescape(hostname)%>&mac=<%=urlescape(sysconfig.primary_mac)%>&email=<%=urlescape(contact or '')%>\">this form</a> "
-"or send it together with your node's name (<em><%=escape(hostname)%></em>) to "
-"<a href=\"mailto:kontakt@hochstift.freifunk.net\">kontakt@hochstift.freifunk.net</a>."
+"To register, send the key together with your node's name to "
+"<a href=\"mailto:kontakt@hochstift.freifunk.net?subject=<%= urlencode('new node \'' .. hostname .. '\'') %>&amp;"
+"body=<%= urlencode(hostname .. '\n\n# Owner: ') %><%= urlencode(contact or '\n') %><%= urlencode('\n# MAC: ' .. sysconfig.primary_mac .. '\nkey \"' .. pubkey .. '\";\n\nYour message:\n') %>\">kontakt@hochstift.freifunk.net</a> or use the "
+"<a href=\"https://hochstift.freifunk.net/neuen-knoten-eintragen/?key=<%= pubkey %>&amp;nname=<%= urlencode(hostname) %>&amp;mac=<%= urlencode(sysconfig.primary_mac) %>&amp;email=<%= urlencode(contact or '') %>\"> "
+"formular filled in beforehand on our website</a>."
 "</p>"
 "<div class=\"the-key\">"
-"<%=escape(hostname)%><br/><br/>"
-"# Owner: <%=escape(contact or '')%><br/>"
-"# MAC: <%=escape(sysconfig.primary_mac)%><br/>"
-"key \"<%=escape(pubkey)%>\";"
+"<%= pcdata(hostname) %><br/><br/>"
+"# Owner: <%= pcdata(contact) %><br/>"
+"# MAC: <%= pcdata(sysconfig.primary_mac) %><br/>"
+"key \"<%= pubkey %>\";"
 "</div>"
 
+msgid "gluon-config-mode:novpn"
+msgstr ""
+"<p>You have selected not to use the mesh VPN. "
+"Your node will only be able to connect to the Freifunk network if other nodes in reach "
+"already have a connection.</p>"
+
 msgid "gluon-config-mode:reboot"
 msgstr ""
-"<p>The node is currently rebooting and will try to connect to other "
-"nearby Freifunk nodes  after that. "
-"Your can find lots of information on the Freifunk Hochstift community on "
+"<p>Your node <em><%= pcdata(hostname) %></em> is currently rebooting and will "
+"try to connect to other nearby Freifunk nodes after that. For more "
+"information about the Freifunk Hochstift community, have a look at "
 "<a href=\"https://hochstift.freifunk.net/\">our homepage</a>.</p>"
-"<p>Have fun with your node and exploring the Freifunk network!</p>"
+"<p>To get back to this configuration interface, press the reset button for "
+"3 seconds during normal operation. The device will then reboot into config "
+"mode.</p>"
+"<p>Have fun with your node and exploring of the Freifunk network!</p>"

i18n/gluon-site.pot

@@ -10,5 +10,14 @@ msgstr ""
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 
+msgid "gluon-config-mode:novpn"
+msgstr ""
+
 msgid "gluon-config-mode:reboot"
 msgstr ""
+
+msgid "gluon-config-mode:altitude-label"
+msgstr ""
+
+msgid "gluon-config-mode:altitude-help"
+msgstr ""

modules

@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffho'
 
-PACKAGES_FFHO_REPO=https://git.ffho.net/FreifunkHochstift/ffho-packages.git
-PACKAGES_FFHO_BRANCH=v2016.2.x
-PACKAGES_FFHO_COMMIT=72ba236324fb538dc304695285fae059489365b9
+PACKAGES_FFHO_REPO=https://git.ffho.net/freifunkhochstift/ffho-packages.git
+PACKAGES_FFHO_BRANCH=master
+PACKAGES_FFHO_COMMIT=8a7a1ae9ade64447a24748755afe9b0413209521

patches/0001-openwrt-patch-iw.patch

@@ -2,11 +2,11 @@ From: Karsten Böddeker <freifunk@kb-light.de>
 Date: Sat, 23 Apr 2016 15:20:30 +0200
 Subject: openwrt: patch iw
 
-diff --git a/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch b/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch
+diff --git a/patches/lede/1001-iw-patch-200-reduce-size-patch.patch b/patches/lede/1001-iw-patch-200-reduce-size-patch.patch
 new file mode 100644
 index 0000000..09c978e
 --- /dev/null
-+++ b/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch
++++ b/patches/lede/1001-iw-patch-200-reduce-size-patch.patch
 @@ -0,0 +1,23 @@
 +From: Karsten Böddeker <freifunk@kb-light.de>
 +Date: Sat, 23 Apr 2016 15:20:29 +0200
@@ -19,8 +19,8 @@ index 0000000..09c978e
 +@@ -1,12 +1,11 @@
 + --- a/Makefile
 + +++ b/Makefile
-+-@@ -15,8 +15,8 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
-++@@ -16,7 +16,7 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
++-@@ -16,8 +16,8 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
+++@@ -17,7 +17,7 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
 +  OBJS = iw.o genl.o event.o info.o phy.o \
 +  	interface.o ibss.o station.o survey.o util.o ocb.o \
 +  	mesh.o mpath.o mpp.o scan.o reg.o version.o \

patches/0002-web-osm-translation-mismatch.patch

@@ -0,0 +1,17 @@
+From: Michael Schwarz <post@michael-schwarz.name>
+Date: Fre, 18 Jan 2018 09:18:30 +0200
+Subject: gluon: patch gluon-config-mode-geo-location translation
+
+diff --git a/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua b/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
+index 6a211b64..928b4c5a 100644
+--- a/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
++++ b/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
+@@ -15,7 +15,7 @@ return function(form, uci)
+ 	if not text then
+ 		text = pkg_i18n.translate(
+ 			'If you want the location of your node to ' ..
+-			'be displayed on the map, you can enter its coordinates here.'
++			'be displayed on public maps, you can enter its coordinates here.'
+ 		)
+ 		if osm then
+ 			text = text .. ' ' .. osm.help(i18n)

site.mk

@@ -1,42 +1,29 @@
+GLUON_FEATURES := \
+        autoupdater \
+        ebtables-filter-multicast \
+        ebtables-filter-ra-dhcp \
+        ebtables-limit-arp \
+	config-mode-geo-location-osm \
+        mesh-batman-adv-15 \
+        mesh-vpn-fastd \
+        radvd \
+        respondd \
+        status-page \
+        web-advanced \
+        web-wizard
+
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-15 \
+	-gluon-web-autoupdater \
 	ffho-ap-timer \
-	gluon-respondd \
-	ffho-ath9k-blackout-workaround \
-	gluon-autoupdater \
 	ffho-autoupdater-wifi-fallback \
-	ffho-autoupdater-wifi-fallback-legacy \
 	ffho-banner \
-	gluon-config-mode-core \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-contact-info \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
 	ffho-config-mode-site-select \
 	ffho-debug \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	ffho-ebtables-net-rules \
-	ffho-fix-defaultroute \
-	gluon-luci-admin \
-	ffho-luci-ap-timer \
-	ffho-luci-autoupdater-wifi-fallback \
-	gluon-luci-portconfig \
-	gluon-luci-wifi-config \
-	gluon-mesh-vpn-fastd \
-	gluon-next-node \
-	gluon-radvd \
-	gluon-setup-mode \
-	ffho-site-auto-select \
-	ffho-status-page \
+	ffho-web-ap-timer \
+	ffho-web-autoupdater \
 	iwinfo \
-	iptables \
 	haveged
 
-APU2_NIC := \
-	kmod-igb
-
 USB_BASIC := \
 	kmod-usb-core \
 	kmod-usb2 \
@@ -52,7 +39,6 @@ USB_NIC := \
 WLAN := \
 	kmod-ath9k \
 	kmod-ath10k-ct \
-	ath10k-firmware-qca988x-11s
 
 ifeq ($(GLUON_TARGET),x86-generic)
 	GLUON_SITE_PACKAGES += \
@@ -64,14 +50,13 @@ endif
 
 ifeq ($(GLUON_TARGET),x86-64)
 	GLUON_SITE_PACKAGES += \
-		$(APU2_NIC) \
 		$(USB_BASIC) \
 		$(USB_NIC) \
 		$(WLAN)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.0.5~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.2.0~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)