diff --git a/i18n/de.po b/i18n/de.po
index d583e807479888bffcf5b5ff328b33b7e15a5c4d..6996a4a27be2e2a5b26456205a0fdcceeeb83978 100644
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-05-17 20:28+0100\n"
-"Last-Translator: Leonard Penzer <leonard@penzer.de>\n"
+"PO-Revision-Date: 2015-12-27 20:28+0100\n"
+"Last-Translator: Leonard Penzer <leonard@penzer.de> Flip <freifunk@philhil.de>\n"
"Language-Team: German\n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -19,14 +19,21 @@ msgstr ""
msgid "gluon-config-mode:pubkey"
msgstr ""
-"Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem er auf "
+"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem er auf "
"den Servern des Stuttgarter Freifunk-Projektes eingetragen wurde "
"kann sich dein Knoten mit den Mesh-VPNs in Stuttgart verbinden. "
"Bitte schicke dazu diesen Schlüssel, den Namen deines Knotens (<em><%=hostname%></em>) und die MAC-Adresse (<em><%=sysconfig.primary_mac%></em>) "
"an <a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&body=Name%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">vpn-schluessel@lists.freifunk-stuttgart.net</a> - "
"<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&body=Name%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">Email jetzt absenden</a>. "
"<small>Ein Klick auf den E-Mail Link müsste™ dein E-Mail Programm "
-"öffnen und alle benötigten Informationen in eine neue Mail einfügen.</small>"
+"öffnen und alle benötigten Informationen in eine neue Mail einfügen.</small></p>"
+"<div class=\"the-key\">"
+" Name: <%= hostname %>"
+" <br/>"
+" Key: <%= pubkey %>"
+" <br/>"
+" MAC: <%= sysconfig.primary_mac %>"
+"</div>"
msgid "gluon-config-mode:reboot"
msgstr ""
diff --git a/i18n/en.po b/i18n/en.po
index 627edd24175b21696d8d3455ba48d086826b468d..1ca7f15d5981a0b20ee178c3f2fb187a3812b325 100644
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-05-19 20:28+0100\n"
-"Last-Translator: Leonard Penzer <leonard@penzer.de>\n"
+"PO-Revision-Date: 2015-12-27 20:28+0100\n"
+"Last-Translator: Leonard Penzer <leonard@penzer.de> Flip <freifunk@philhil.de>\n"
"Language-Team: English\n"
"Language: en\n"
"MIME-Version: 1.0\n"
@@ -20,12 +20,19 @@ 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 "
"Stuttgart servers. "
"To register the key send it together with your node's name (<em><%=hostname%></em>) and MAC (<em><%=sysconfig.primary_mac%></em>) to "
"<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&body=Name%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">vpn-schluessel@lists.freifunk-stuttgart.net</a> - "
-"<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&body=Name%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">click to send mail</a>. "
+"<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&body=Name%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">click to send mail</a>. </p>"
+"<div class=\"the-key\">"
+" Name: <%= hostname %>"
+" <br/>"
+" Key: <%= pubkey %>"
+" <br/>"
+" MAC: <%= sysconfig.primary_mac %>"
+"</div>"
msgid "gluon-config-mode:reboot"
msgstr ""
diff --git a/site.conf b/site.conf
index 07e1cb64ca8ce4f0a578205b1a2f0ca869856cd2..1be3727eea648974998f90d669839a0ed7e639ac 100644
--- a/site.conf
+++ b/site.conf
@@ -2,33 +2,49 @@
hostname_prefix = 'ffs-',
site_name = 'Freifunk Stuttgart',
site_code = 'ffs',
-
- prefix4 = '172.21.0.0/18',
+
+ opkg = {
+ openwrt = 'http://[fd21:b4dc:4b1e::a38:1]/openwrt/barrier_breaker/14.07/%S/packages',
+ },
+
+ prefix4 = '172.21.0.0/18',
prefix6 = 'fd21:b4dc:4b1e::/64',
-
- timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
- ntp_servers = {
+
+ timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
+
+ ntp_servers = {
'fd21:b4dc:4b1e::a38:1', -- gw01
},
- opkg_repo = 'http://[fd21:b4dc:4b1e::a38:1]/openwrt/barrier_breaker/14.07/%S/packages',
+
regdom = 'DE',
- wifi24 = {
- ssid = 'Freifunk',
- channel = 1,
- htmode = 'HT20',
- mesh_ssid = '02:04:08:16:32:64',
- mesh_bssid = '02:04:08:16:32:64',
- mesh_mcast_rate = 12000,
- },
- wifi5 = {
- ssid = 'Freifunk',
- channel = 44,
- htmode = 'HT20',
- mesh_ssid = '02:04:08:16:32:64',
- mesh_bssid = '02:04:08:16:32:64',
- mesh_mcast_rate = 12000,
- },
+
+ wifi24 = {
+ channel = 1,
+ htmode = 'HT20', --only for optic
+ ap = {
+ ssid = 'Freifunk',
+ },
+ ibss = {
+ ssid = '02:04:08:16:32:64',
+ bssid = '02:04:08:16:32:64',
+ mcast_rate = 12000,
+ },
+ },
+
+ wifi5 = {
+ channel = 44,
+ htmode = 'HT20', --only for optic
+ ap = {
+ ssid = 'Freifunk',
+ },
+ ibss = {
+ ssid = '02:04:08:16:32:64',
+ bssid = '02:04:08:16:32:64',
+ mcast_rate = 12000,
+ },
+ },
+
next_node = {
ip4 = '172.21.24.254',
@@ -87,6 +103,13 @@
},
},
},
+ },
+
+ bandwidth_limit = {
+ -- Default upload limit (kbit/s).
+ egress = 500,
+ -- Default download limit (kbit/s).
+ ingress = 15000,
},
autoupdater = {
@@ -132,16 +155,4 @@
},
},
- simple_tc = {
- mesh_vpn = {
- ifname = 'mesh-vpn',
- enabled = false,
- limit_egress = 400,
- limit_ingress = 6000,
- },
- },
-
- -- enable BATMAN on WAN interface by default (see gluon-luci-portconfig for webinterface)
- mesh_on_wan = false,
-
}
diff --git a/site.mk b/site.mk
index 2a2cbe1ea9cde7a2bf85412e9b0eadc3339da1f2..5fc059a676975a2dec800c114ccc6f6944f9e677 100644
--- a/site.mk
+++ b/site.mk
@@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \
iwinfo
-DEFAULT_GLUON_RELEASE := 0.5+0-$(shell date '+%Y.%m.%d-%H.%M')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
+DEFAULT_GLUON_RELEASE := 0.6-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
GLUON_LANGS := de en