Updated translations to display vpn-key, updated site.conf to actual format

i18n/de.po

@@ -18,6 +18,7 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
+"<p>"
 "Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem "
 "er auf den Servern des Paderborner Freifunk-Projektes eingetragen wurde, "
 "kann sich dein Knoten mit dem Paderborner Mesh-VPN zu verbinden. Bitte "
@@ -25,6 +26,12 @@ msgstr ""
 "an maschinenraum@paderborn.freifunk.net oder benutze am besten gleich das "
 "<a href=\"http://paderborn.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>\"> "
 "vorausgefüllte Formular auf unserer Webseite</a>.<br><br>"
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

i18n/en.po

@@ -17,6 +17,7 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
+"<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 "
 "Paderborn servers. "
@@ -24,7 +25,12 @@ msgstr ""
 "<a href=\"http://paderborn.freifunk.net/?page_id=366&key=<%=pubkey%>&nname=<%=hostname%>&mac=<%=sysconfig.primary_mac%>\">this form</a> "
 "or send it together with your node's name (<em><%=hostname%></em>) to "
 "<a href=\"mailto:maschinenraum@paderborn.freifunk.net\">maschinenraum@paderborn.freifunk.net</a>."
-
+"</p>"
+"<div class=\"the-key\">"
+" # <%= hostname %>"
+" <br/>"
+"<%= pubkey %>"
+"</div>"
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

site.conf

@@ -23,7 +23,9 @@
 	ntp_servers = {'ntp.services.ffpb'},
 
         -- OpenWRT Package Repository (IPv6 capable)
-	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/chaos_calmer/15.05-rc3/%S/packages/',
+	opkg = {
+		openwrt = 'http://bo.mirror.garr.it/pub/1/openwrt/chaos_calmer/15.05-rc3/%S/packages/',
+	},
 
 	-- regulatory domain of your wifi
 	regdom = 'DE',
@@ -158,6 +160,16 @@
 				},
 			},
 		},
+
+	-- default traffic shaping (bandwidth limit) settings
+		bandwidth_limit = {
+			enabled = false,
+			egress = 200,
+			ingress = 3000,
+		},
+	},
+
+
 	},
 
 	-- configure the autoupdater
@@ -218,16 +230,6 @@
 		},
 	},
 
-	-- default traffic shaping (bandwidth limit) settings
-	simple_tc = {
-		mesh_vpn = {
-			ifname = 'mesh-vpn',
-			enabled = false,
-			limit_egress = 200,
-			limit_ingress = 3000,
-		},
-	},
-
 	-- configure ffpb-debug
 	debugserver = {
 		host = { 'debugreport.paderborn.freifunk.net', 'fdca:ffee:ff12:a254::deb9' },