Skip to content
Snippets Groups Projects
Commit 858cf70f authored by Leonard Penzer's avatar Leonard Penzer
Browse files

Merge remote-tracking branch 'origin/prepare_for_v2015.2' 

In Zukunft soll auf dem master-branch das sein, was zum master-Branch von Gluon passt. Die Version für die stable-FW wird nun auf dem stable-Branch gepflegt.
parents 27c5bffd e7be8865
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
i18n/de.po
+ 11
− 4
View file @ 858cf70f
...@@ -2,8 +2,8 @@ msgid "" ...@@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2015-05-17 20:28+0100\n" "PO-Revision-Date: 2015-12-27 20:28+0100\n"
"Last-Translator: Leonard Penzer <leonard@penzer.de>\n" "Last-Translator: Leonard Penzer <leonard@penzer.de> Flip <freifunk@philhil.de>\n"
"Language-Team: German\n" "Language-Team: German\n"
"Language: de\n" "Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -19,14 +19,21 @@ msgstr "" ...@@ -19,14 +19,21 @@ msgstr ""
msgid "gluon-config-mode:pubkey" msgid "gluon-config-mode:pubkey"
msgstr "" 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 " "den Servern des Stuttgarter Freifunk-Projektes eingetragen wurde "
"kann sich dein Knoten mit den Mesh-VPNs in Stuttgart verbinden. " "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>) " "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?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&amp;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> - " "an <a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&amp;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?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&amp;body=Name%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>%0D%0AMAC%3A%20<%=sysconfig.primary_mac%>%0D%0A\">Email jetzt absenden</a>. " "<a href=\"mailto:vpn-schluessel@lists.freifunk-stuttgart.net?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&amp;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&trade; dein E-Mail Programm " "<small>Ein Klick auf den E-Mail Link müsste&trade; 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" msgid "gluon-config-mode:reboot"
msgstr "" msgstr ""
......
i18n/en.po
+ 11
− 4
View file @ 858cf70f
...@@ -2,8 +2,8 @@ msgid "" ...@@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"PO-Revision-Date: 2015-05-19 20:28+0100\n" "PO-Revision-Date: 2015-12-27 20:28+0100\n"
"Last-Translator: Leonard Penzer <leonard@penzer.de>\n" "Last-Translator: Leonard Penzer <leonard@penzer.de> Flip <freifunk@philhil.de>\n"
"Language-Team: English\n" "Language-Team: English\n"
"Language: en\n" "Language: en\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -20,12 +20,19 @@ msgstr "" ...@@ -20,12 +20,19 @@ msgstr ""
msgid "gluon-config-mode:pubkey" msgid "gluon-config-mode:pubkey"
msgstr "" 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 " "connect to the mesh VPN until the key has been registered on the Freifunk "
"Stuttgart servers. " "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 " "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?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&amp;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?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&amp;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?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&amp;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?&amp;subject=Neuer%20Freifunk-Knoten%3A%20<%=hostname%>&amp;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" msgid "gluon-config-mode:reboot"
msgstr "" msgstr ""
......
site.conf
+ 45
− 34
View file @ 858cf70f
...@@ -2,33 +2,49 @@ ...@@ -2,33 +2,49 @@
hostname_prefix = 'ffs-', hostname_prefix = 'ffs-',
site_name = 'Freifunk Stuttgart', site_name = 'Freifunk Stuttgart',
site_code = 'ffs', 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', prefix6 = 'fd21:b4dc:4b1e::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {
ntp_servers = {
'fd21:b4dc:4b1e::a38:1', -- gw01 'fd21:b4dc:4b1e::a38:1', -- gw01
}, },
opkg_repo = 'http://[fd21:b4dc:4b1e::a38:1]/openwrt/barrier_breaker/14.07/%S/packages',
regdom = 'DE', regdom = 'DE',
wifi24 = {
ssid = 'Freifunk', wifi24 = {
channel = 1, channel = 1,
htmode = 'HT20', htmode = 'HT20', --only for optic
mesh_ssid = '02:04:08:16:32:64', ap = {
mesh_bssid = '02:04:08:16:32:64', ssid = 'Freifunk',
mesh_mcast_rate = 12000, },
}, ibss = {
wifi5 = { ssid = '02:04:08:16:32:64',
ssid = 'Freifunk', bssid = '02:04:08:16:32:64',
channel = 44, mcast_rate = 12000,
htmode = 'HT20', },
mesh_ssid = '02:04:08:16:32:64', },
mesh_bssid = '02:04:08:16:32:64',
mesh_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 = { next_node = {
ip4 = '172.21.24.254', ip4 = '172.21.24.254',
...@@ -87,6 +103,13 @@ ...@@ -87,6 +103,13 @@
}, },
}, },
}, },
},
bandwidth_limit = {
-- Default upload limit (kbit/s).
egress = 500,
-- Default download limit (kbit/s).
ingress = 15000,
}, },
autoupdater = { autoupdater = {
...@@ -132,16 +155,4 @@ ...@@ -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,
} }
site.mk
+ 1
− 1
View file @ 858cf70f
...@@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \ ...@@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \
iwinfo 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 GLUON_LANGS := de en
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Impressum - Datenschutz