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

merged master onto nightly - might missing changes in site.mk

parents 97788e2a 869c3f5c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
i18n/de.po 0 → 100644
+ 55
− 0
View file @ c2f7690f
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\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"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "gluon-config-mode:welcome"
msgstr ""
"Willkommen zum Einrichtungsassistenten für deinen neuen Freifunk-Knoten."
"Fülle das folgende Formular deinen Vorstellung entsprechend aus und sende es ab. "
"Wenn Du Koordinaten für für die Eintragung auf der Karte benötigst, "
"kannst Du unsere <a href=\"http://karte.freifunk-stuttgart.de/\" target=\"_blank\">Karte</a> verwenden."
msgid "gluon-config-mode:pubkey"
msgstr ""
"<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?&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>. "
"<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></p>"
"<div class=\"the-key\">"
" Name: <%= hostname %>"
" <br/>"
" Key: <%= pubkey %>"
" <br/>"
" MAC: <%= sysconfig.primary_mac %>"
"</div>"
msgid "gluon-config-mode:reboot"
msgstr ""
"Dein Knoten startet gerade neu und wird anschließend versuchen, sich mit anderen "
"Freifunk-Knoten in seiner Nähe zu verbinden. "
"<h2>Und was jetzt?</h2>"
"Weitere Informationen zur Freifunk-Community findest du auf den Webseiten von "
"<a href=\"http://www.freifunk-suttgart.de/\">Freifunk Stuttgart</a> oder unter <a href=\"http://www.freifunk.net/\">freifunk.net</a>. "
"<dl> "
" <dt>Karte</dt> "
" <dd>Die Karten sind unter <a href=\"http://karte.freifunk-stuttgart.de/\">gw01.freifunk-stuttgart.de/</a> erreichbar.</dd> "
" <dt>Next Node</dt> "
" <dd>Den Router mit dem man momentan verbunden ist, kann man immer unter der sogenannten Next Node Adresse erreichen. Diese ist für jeden Router gleich:</dd> "
" <dd>&bull; Stuttgart &mdash; <a href=\"http://[fd21:b4dc:4b1e::1]/\">fd21:b4dc:4b1e::1</a> &ndash; <a href=\"http://172.21.24.254/\">172.21.24.254</a></dd> "
"</dl> "
"Viel Spaß mit deinem Knoten und bei der Erkundung von Freifunk!<br /> "
"<small>Hilf uns weitere Anleitungen, Texte, Grafiken, Applikationen, Schaubilder, und ähnliches zu erstellen die wir hier verlinken können, um jedem neuen Freifunker einen guten Start zu ermöglichen</small>"
i18n/en.po 0 → 100644
+ 46
− 0
View file @ c2f7690f
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\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"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "gluon-config-mode:welcome"
msgstr ""
"Welcome the the setup wizard of your new Freifunk Stuttgart node. "
"Please fill out the following form and transmit it."
"If you need location data, "
"you can use our <a href=\"http://karte.freifunk-stuttgart.de/\" target=\"_blank\">Map</a>."
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 "
"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?&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>. </p>"
"<div class=\"the-key\">"
" Name: <%= hostname %>"
" <br/>"
" Key: <%= pubkey %>"
" <br/>"
" MAC: <%= sysconfig.primary_mac %>"
"</div>"
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 Stuttgart community on "
"<a href=\"http://www.freifunk-stuttgart.de/\">our homepage</a>.</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 the Freifunk network!</p>"
i18n/gluon-site.pot 0 → 100644
+ 11
− 0
View file @ c2f7690f
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "gluon-config-mode:welcome"
msgstr ""
msgid "gluon-config-mode:pubkey"
msgstr ""
msgid "gluon-config-mode:reboot"
msgstr ""
site.conf
+ 181
− 176
View file @ c2f7690f
{ {
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', prefix4 = '172.21.0.0/18',
prefix6 = 'fd21:b4dc:4b00::/64', prefix6 = 'fd21:711::/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:4b00::a38:1', -- gw01 'fd21:b4dc:4b00::a38:1', -- gw01
}, },
opkg_repo = 'http://[fd21:b4dc:4b00::a38:1]/openwrt/barrier_breaker/14.07/%S/packages',
regdom = 'DE', regdom = 'DE',
wifi24 = { wifi24 = {
ssid = 'Freifunk',
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 = {
ssid = '02:04:08:16:32:64',
bssid = '02:04:08:16:32:64',
mcast_rate = 12000,
},
}, },
wifi5 = { wifi5 = {
ssid = 'Freifunk',
channel = 44, channel = 44,
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 = {
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',
ip6 = 'fd21:b4dc:4b1e::1', ip6 = 'fd21:711::1',
mac = '02:00:0a:25:00:01', mac = '02:00:0a:25:00:01',
}, },
...@@ -43,150 +54,157 @@ ...@@ -43,150 +54,157 @@
groups = { groups = {
backbone = { backbone = {
limit = 1, limit = 1,
peers = { peers = {
gw01 = { gw01 = {
key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6', key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
remotes = { remotes = {
'"gw01.freifunk-stuttgart.de" port 10037', '"gw01.freifunk-stuttgart.de" port 10037',
'"gw01.freifunk-stuttgart.de" port 10041', '"gw01s01.freifunk-stuttgart.de" port 10041',
'"gw01.freifunk-stuttgart.de" port 10042', '"gw01s02.freifunk-stuttgart.de" port 10042',
'"gw01.freifunk-stuttgart.de" port 10043', '"gw01s03.freifunk-stuttgart.de" port 10043',
'"gw01.freifunk-stuttgart.de" port 10044', '"gw01s04.freifunk-stuttgart.de" port 10044',
'"gw01.freifunk-stuttgart.de" port 10045', '"gw01s05.freifunk-stuttgart.de" port 10045',
'"gw01.freifunk-stuttgart.de" port 10046', '"gw01s06.freifunk-stuttgart.de" port 10046',
'"gw01.freifunk-stuttgart.de" port 10047', '"gw01s07.freifunk-stuttgart.de" port 10047',
'"gw01.freifunk-stuttgart.de" port 10048' '"gw01s08.freifunk-stuttgart.de" port 10048'
}, },
}, },
gw02 = { gw02 = {
key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a', key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a',
remotes = { remotes = {
'"gw02.freifunk-stuttgart.de" port 10037', '"gw02.freifunk-stuttgart.de" port 10037',
'"gw02.freifunk-stuttgart.de" port 10041', '"gw02s01.freifunk-stuttgart.de" port 10041',
'"gw02.freifunk-stuttgart.de" port 10042', '"gw02s02.freifunk-stuttgart.de" port 10042',
'"gw02.freifunk-stuttgart.de" port 10043', '"gw02s03.freifunk-stuttgart.de" port 10043',
'"gw02.freifunk-stuttgart.de" port 10044', '"gw02s04.freifunk-stuttgart.de" port 10044',
'"gw02.freifunk-stuttgart.de" port 10045', '"gw02s05.freifunk-stuttgart.de" port 10045',
'"gw02.freifunk-stuttgart.de" port 10046', '"gw02s06.freifunk-stuttgart.de" port 10046',
'"gw02.freifunk-stuttgart.de" port 10047', '"gw02s07.freifunk-stuttgart.de" port 10047',
'"gw02.freifunk-stuttgart.de" port 10048' '"gw02s08.freifunk-stuttgart.de" port 10048'
}, },
}, },
gw03 = { gw03 = {
key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2', key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
remotes = { remotes = {
'"gw03.freifunk-stuttgart.de" port 10037', '"gw03.freifunk-stuttgart.de" port 10037',
'"gw03.freifunk-stuttgart.de" port 10041', '"gw03s01.freifunk-stuttgart.de" port 10041',
'"gw03.freifunk-stuttgart.de" port 10042', '"gw03s02.freifunk-stuttgart.de" port 10042',
'"gw03.freifunk-stuttgart.de" port 10043', '"gw03s03.freifunk-stuttgart.de" port 10043',
'"gw03.freifunk-stuttgart.de" port 10044', '"gw03s04.freifunk-stuttgart.de" port 10044',
'"gw03.freifunk-stuttgart.de" port 10045', '"gw03s05.freifunk-stuttgart.de" port 10045',
'"gw03.freifunk-stuttgart.de" port 10046', '"gw03s06.freifunk-stuttgart.de" port 10046',
'"gw03.freifunk-stuttgart.de" port 10047', '"gw03s07.freifunk-stuttgart.de" port 10047',
'"gw03.freifunk-stuttgart.de" port 10048' '"gw03s08.freifunk-stuttgart.de" port 10048'
}, },
}, },
gw04 = { gw04 = {
key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf', key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
remotes = { remotes = {
'"gw04.freifunk-stuttgart.de" port 10037', '"gw04.freifunk-stuttgart.de" port 10037',
'"gw04.freifunk-stuttgart.de" port 10041', '"gw04s01.freifunk-stuttgart.de" port 10041',
'"gw04.freifunk-stuttgart.de" port 10042', '"gw04s02.freifunk-stuttgart.de" port 10042',
'"gw04.freifunk-stuttgart.de" port 10043', '"gw04s03.freifunk-stuttgart.de" port 10043',
'"gw04.freifunk-stuttgart.de" port 10044', '"gw04s04.freifunk-stuttgart.de" port 10044',
'"gw04.freifunk-stuttgart.de" port 10045', '"gw04s05.freifunk-stuttgart.de" port 10045',
'"gw04.freifunk-stuttgart.de" port 10046', '"gw04s06.freifunk-stuttgart.de" port 10046',
'"gw04.freifunk-stuttgart.de" port 10047', '"gw04s07.freifunk-stuttgart.de" port 10047',
'"gw04.freifunk-stuttgart.de" port 10048' '"gw04s08.freifunk-stuttgart.de" port 10048'
}, },
}, },
gw05 = { gw05 = {
key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789', key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
remotes = { remotes = {
'"gw05.freifunk-stuttgart.de" port 10037', '"gw05.freifunk-stuttgart.de" port 10037',
'"gw05.freifunk-stuttgart.de" port 10041', '"gw05s01.freifunk-stuttgart.de" port 10041',
'"gw05.freifunk-stuttgart.de" port 10042', '"gw05s02.freifunk-stuttgart.de" port 10042',
'"gw05.freifunk-stuttgart.de" port 10043', '"gw05s03.freifunk-stuttgart.de" port 10043',
'"gw05.freifunk-stuttgart.de" port 10044', '"gw05s04.freifunk-stuttgart.de" port 10044',
'"gw05.freifunk-stuttgart.de" port 10045', '"gw05s05.freifunk-stuttgart.de" port 10045',
'"gw05.freifunk-stuttgart.de" port 10046', '"gw05s06.freifunk-stuttgart.de" port 10046',
'"gw05.freifunk-stuttgart.de" port 10047', '"gw05s07.freifunk-stuttgart.de" port 10047',
'"gw05.freifunk-stuttgart.de" port 10048' '"gw05s08.freifunk-stuttgart.de" port 10048'
}, },
}, },
gw06 = { gw06 = {
key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2', key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
remotes = { remotes = {
'"gw06.freifunk-stuttgart.de" port 10037', '"gw06.freifunk-stuttgart.de" port 10037',
'"gw06.freifunk-stuttgart.de" port 10041', '"gw06s01.freifunk-stuttgart.de" port 10041',
'"gw06.freifunk-stuttgart.de" port 10042', '"gw06s02.freifunk-stuttgart.de" port 10042',
'"gw06.freifunk-stuttgart.de" port 10043', '"gw06s03.freifunk-stuttgart.de" port 10043',
'"gw06.freifunk-stuttgart.de" port 10044', '"gw06s04.freifunk-stuttgart.de" port 10044',
'"gw06.freifunk-stuttgart.de" port 10045', '"gw06s05.freifunk-stuttgart.de" port 10045',
'"gw06.freifunk-stuttgart.de" port 10046', '"gw06s06.freifunk-stuttgart.de" port 10046',
'"gw06.freifunk-stuttgart.de" port 10047', '"gw06s07.freifunk-stuttgart.de" port 10047',
'"gw06.freifunk-stuttgart.de" port 10048' '"gw06s08.freifunk-stuttgart.de" port 10048'
}, },
}, },
gw07 = { gw07 = {
key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1', key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
remotes = { remotes = {
'"gw07.freifunk-stuttgart.de" port 10037', '"gw07.freifunk-stuttgart.de" port 10037',
'"gw07.freifunk-stuttgart.de" port 10041', '"gw07s01.freifunk-stuttgart.de" port 10041',
'"gw07.freifunk-stuttgart.de" port 10042', '"gw07s02.freifunk-stuttgart.de" port 10042',
'"gw07.freifunk-stuttgart.de" port 10043', '"gw07s03.freifunk-stuttgart.de" port 10043',
'"gw07.freifunk-stuttgart.de" port 10044', '"gw07s04.freifunk-stuttgart.de" port 10044',
'"gw07.freifunk-stuttgart.de" port 10045', '"gw07s05.freifunk-stuttgart.de" port 10045',
'"gw07.freifunk-stuttgart.de" port 10046', '"gw07s06.freifunk-stuttgart.de" port 10046',
'"gw07.freifunk-stuttgart.de" port 10047', '"gw07s07.freifunk-stuttgart.de" port 10047',
'"gw07.freifunk-stuttgart.de" port 10048' '"gw07s08.freifunk-stuttgart.de" port 10048'
}, },
}, },
gw08 = { gw08 = {
key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3', key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
remotes = { remotes = {
'"gw08.freifunk-stuttgart.de" port 10037', '"gw08.freifunk-stuttgart.de" port 10037',
'"gw08.freifunk-stuttgart.de" port 10041', '"gw08s01.freifunk-stuttgart.de" port 10041',
'"gw08.freifunk-stuttgart.de" port 10042', '"gw08s02.freifunk-stuttgart.de" port 10042',
'"gw08.freifunk-stuttgart.de" port 10043', '"gw08s03.freifunk-stuttgart.de" port 10043',
'"gw08.freifunk-stuttgart.de" port 10044', '"gw08s04.freifunk-stuttgart.de" port 10044',
'"gw08.freifunk-stuttgart.de" port 10045', '"gw08s05.freifunk-stuttgart.de" port 10045',
'"gw08.freifunk-stuttgart.de" port 10046', '"gw08s06.freifunk-stuttgart.de" port 10046',
'"gw08.freifunk-stuttgart.de" port 10047', '"gw08s07.freifunk-stuttgart.de" port 10047',
'"gw08.freifunk-stuttgart.de" port 10048' '"gw08s08.freifunk-stuttgart.de" port 10048'
}, },
}, },
gw09 = { gw09 = {
key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2', key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
remotes = { remotes = {
'"gw09.freifunk-stuttgart.de" port 10037', '"gw09.freifunk-stuttgart.de" port 10037',
'"gw09.freifunk-stuttgart.de" port 10041', '"gw09s01.freifunk-stuttgart.de" port 10041',
'"gw09.freifunk-stuttgart.de" port 10042', '"gw09s02.freifunk-stuttgart.de" port 10042',
'"gw09.freifunk-stuttgart.de" port 10043', '"gw09s03.freifunk-stuttgart.de" port 10043',
'"gw09.freifunk-stuttgart.de" port 10044', '"gw09s04.freifunk-stuttgart.de" port 10044',
'"gw09.freifunk-stuttgart.de" port 10045', '"gw09s05.freifunk-stuttgart.de" port 10045',
'"gw09.freifunk-stuttgart.de" port 10046', '"gw09s06.freifunk-stuttgart.de" port 10046',
'"gw09.freifunk-stuttgart.de" port 10047', '"gw09s07.freifunk-stuttgart.de" port 10047',
'"gw09.freifunk-stuttgart.de" port 10048' '"gw09s08.freifunk-stuttgart.de" port 10048'
}, },
}, },
gw10 = { gw10 = {
key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00', key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
remotes = { remotes = {
'"gw10.freifunk-stuttgart.de" port 10037', '"gw10.freifunk-stuttgart.de" port 10037',
'"gw10.freifunk-stuttgart.de" port 10041', '"gw10s01.freifunk-stuttgart.de" port 10041',
'"gw10.freifunk-stuttgart.de" port 10042', '"gw10s02.freifunk-stuttgart.de" port 10042',
'"gw10.freifunk-stuttgart.de" port 10043', '"gw10s03.freifunk-stuttgart.de" port 10043',
'"gw10.freifunk-stuttgart.de" port 10044', '"gw10s04.freifunk-stuttgart.de" port 10044',
'"gw10.freifunk-stuttgart.de" port 10045', '"gw10s05.freifunk-stuttgart.de" port 10045',
'"gw10.freifunk-stuttgart.de" port 10046', '"gw10s06.freifunk-stuttgart.de" port 10046',
'"gw10.freifunk-stuttgart.de" port 10047', '"gw10s07.freifunk-stuttgart.de" port 10047',
'"gw10.freifunk-stuttgart.de" port 10048' '"gw10s08.freifunk-stuttgart.de" port 10048'
}, },
}, },
}, },
}, },
}, },
},
bandwidth_limit = {
-- Default upload limit (kbit/s).
egress = 500,
-- Default download limit (kbit/s).
ingress = 15000,
}, },
autoupdater = { autoupdater = {
...@@ -196,52 +214,39 @@ ...@@ -196,52 +214,39 @@
stable = { stable = {
name = 'stable', name = 'stable',
mirrors = { mirrors = {
'http://[fd21:b4dc:4b00::a38:1]/gluon/stable/sysupgrade', 'http://[fd21:b4dc:4b00::a38:1]/gluon/stable/images/sysupgrade', -- gw01
}, },
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
'0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
}, },
}, },
beta = { beta = {
name = 'beta', name = 'beta',
mirrors = { mirrors = {
'http://[fd21:b4dc:4b00::a38:1]/gluon/beta/sysupgrade', 'http://[fd21:b4dc:4b00::a38:1]/gluon/beta/images/sysupgrade', -- gw01
}, },
good_signatures = 1, good_signatures = 1,
pubkeys = { pubkeys = {
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
'0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
}, },
}, },
nightly = { nightly = {
name = 'nightly', name = 'nightly',
mirrors = { mirrors = {
'http://[fd21:b4dc:4b00::a38:1]/gluon/nightly/sysupgrade', 'http://[fd21:b4dc:4b00::a38:1]/gluon/nightly/images/sysupgrade', -- gw01
}, },
good_signatures = 1, good_signatures = 1,
pubkeys = { pubkeys = {
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
'0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip 'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
}, },
}, },
}, },
}, },
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
+ 18
− 11
View file @ c2f7690f
GLUON_SITE_PACKAGES := \ GLUON_SITE_PACKAGES := \
gluon-mesh-batman-adv-15 \ gluon-mesh-batman-adv-15 \
gluon-alfred \ gluon-alfred \
gluon-announced \ gluon-respondd \
gluon-autoupdater \ gluon-autoupdater \
gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \
gluon-config-mode-hostname \
gluon-config-mode-autoupdater \ gluon-config-mode-autoupdater \
gluon-config-mode-mesh-vpn \
gluon-config-mode-geo-location \
gluon-config-mode-contact-info \ gluon-config-mode-contact-info \
gluon-luci-private-wifi \ gluon-config-mode-core \
gluon-config-mode-geo-location \
gluon-config-mode-hostname \
gluon-config-mode-mesh-vpn \
gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \
gluon-luci-admin \ gluon-luci-admin \
gluon-luci-autoupdater \ gluon-luci-autoupdater \
gluon-luci-portconfig \ gluon-luci-portconfig \
gluon-mesh-vpn-fastd \ gluon-luci-private-wifi \
gluon-luci-wifi-config \
gluon-neighbour-info \
gluon-next-node \ gluon-next-node \
gluon-mesh-vpn-fastd \
gluon-radvd \ gluon-radvd \
gluon-setup-mode \
gluon-status-page \ gluon-status-page \
iwinfo \ haveged \
iptables \ iptables \
haveged iwinfo
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)
DEFAULT_GLUON_RELEASE := 0.1+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) GLUON_LANGS := de en
# Allow overriding the release number from the command line # Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
......
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