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

changes for multiple segments

parent ac6e2f25
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 189 additions and 100 deletions
site.conf
+ 189
− 100
View file @ 8f26c18a
......@@ -8,13 +8,22 @@
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {
'172.21.24.1','172.21.24.129', 'fd21:b4dc:4b1e::a38:1', -- gluongw
'fd21:b4dc:4b1e::a38:1', -- gw01
'fd21:b4dc:4b00::a38:1', -- anycast
'fd21:b4dc:4b01::a38:1', -- gw01
'fd21:b4dc:4b02::a38:1', -- gw01
'fd21:b4dc:4b03::a38:1', -- gw01
'fd21:b4dc:4b04::a38:1', -- gw01
'fd21:b4dc:4b05::a38:1', -- gw01
'fd21:b4dc:4b06::a38:1', -- gw01
'fd21:b4dc:4b07::a38:1', -- gw01
'fd21:b4dc:4b08::a38:1', -- gw01
},
opkg_repo = 'http://[fd21:b4dc:4b1e::a38:1]/gluon/stable/%S/packages',
opkg_repo = 'http://[fd21:b4dc:4b1e::a38:1]/openwrt/barrier_breaker/14.07/%S/packages',
regdom = 'DE',
wifi24 = {
ssid = 'stuttgart.freifunk.net',
ssid = 'Freifunk',
channel = 1,
htmode = 'HT20',
mesh_ssid = '02:04:08:16:32:64',
......@@ -22,9 +31,9 @@
mesh_mcast_rate = 12000,
},
wifi5 = {
ssid = 'stuttgart.freifunk.net',
ssid = 'Freifunk',
channel = 44,
htmode = 'HT40+',
htmode = 'HT20',
mesh_ssid = '02:04:08:16:32:64',
mesh_bssid = '02:04:08:16:32:64',
mesh_mcast_rate = 12000,
......@@ -33,58 +42,146 @@
next_node = {
ip4 = '172.21.24.254',
ip6 = 'fd21:b4dc:4b1e::1',
mac = '02:00:0a:25:00:01', -- http://freifunk-stuttgart.de/mac.html
mac = '02:00:0a:25:00:01',
},
fastd_mesh_vpn = {
methods = {'salsa2012+gmac'},
methods = {'salsa2012+umac'},
mtu = 1406,
enabled = true,
backbone = {
limit = 2,
peers = {
gw01 = {
key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
remotes = {'"gw01.freifunk-stuttgart.de" port 10037'},
},
gw02 = {
key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a',
remotes = {'"gw02.freifunk-stuttgart.de" port 10037'},
},
gw03 = {
key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
remotes = {'"gw03.freifunk-stuttgart.de" port 10037'},
},
gw04 = {
key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
remotes = {'"gw04.freifunk-stuttgart.de" port 10037'},
},
gw05 = {
key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
remotes = {'"gw05.freifunk-stuttgart.de" port 10037'},
},
gw06 = {
key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
remotes = {'"gw06.freifunk-stuttgart.de" port 10037'},
},
gw07 = {
key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
remotes = {'"gw07.freifunk-stuttgart.de" port 10037'},
},
gw08 = {
key = 'f6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
remotes = {'"gw08.freifunk-stuttgart.de" port 10037'},
},
gw09 = {
key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
remotes = {'"gw09.freifunk-stuttgart.de" port 10037'},
},
gw10 = {
key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
remotes = {'"gw10.freifunk-stuttgart.de" port 10037'},
},
},
},
groups = {
backbone = {
limit = 1,
peers = {
gw01 = {
key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
remotes = {
'"gw01.freifunk-stuttgart.de" port 10037',
'"gw01.freifunk-stuttgart.de" port 10041',
'"gw01.freifunk-stuttgart.de" port 10042',
'"gw01.freifunk-stuttgart.de" port 10043',
'"gw01.freifunk-stuttgart.de" port 10044',
'"gw01.freifunk-stuttgart.de" port 10045',
'"gw01.freifunk-stuttgart.de" port 10046',
'"gw01.freifunk-stuttgart.de" port 10047',
'"gw01.freifunk-stuttgart.de" port 10048'
},
},
gw02 = {
key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a',
remotes = {
'"gw02.freifunk-stuttgart.de" port 10037',
'"gw02.freifunk-stuttgart.de" port 10041',
'"gw02.freifunk-stuttgart.de" port 10042',
'"gw02.freifunk-stuttgart.de" port 10043',
'"gw02.freifunk-stuttgart.de" port 10044',
'"gw02.freifunk-stuttgart.de" port 10045',
'"gw02.freifunk-stuttgart.de" port 10046',
'"gw02.freifunk-stuttgart.de" port 10047',
'"gw02.freifunk-stuttgart.de" port 10048'
},
},
gw03 = {
key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
remotes = {
'"gw03.freifunk-stuttgart.de" port 10037',
'"gw03.freifunk-stuttgart.de" port 10041',
'"gw03.freifunk-stuttgart.de" port 10042',
'"gw03.freifunk-stuttgart.de" port 10043',
'"gw03.freifunk-stuttgart.de" port 10044',
'"gw03.freifunk-stuttgart.de" port 10045',
'"gw03.freifunk-stuttgart.de" port 10046',
'"gw03.freifunk-stuttgart.de" port 10047',
'"gw03.freifunk-stuttgart.de" port 10048'
},
},
gw04 = {
key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
remotes = {
'"gw04.freifunk-stuttgart.de" port 10037',
'"gw04.freifunk-stuttgart.de" port 10041',
'"gw04.freifunk-stuttgart.de" port 10042',
'"gw04.freifunk-stuttgart.de" port 10043',
'"gw04.freifunk-stuttgart.de" port 10044',
'"gw04.freifunk-stuttgart.de" port 10045',
'"gw04.freifunk-stuttgart.de" port 10046',
'"gw04.freifunk-stuttgart.de" port 10047',
'"gw04.freifunk-stuttgart.de" port 10048'
},
},
gw05 = {
key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
remotes = {
'"gw05.freifunk-stuttgart.de" port 10037',
'"gw05.freifunk-stuttgart.de" port 10041',
'"gw05.freifunk-stuttgart.de" port 10042',
'"gw05.freifunk-stuttgart.de" port 10043',
'"gw05.freifunk-stuttgart.de" port 10044',
'"gw05.freifunk-stuttgart.de" port 10045',
'"gw05.freifunk-stuttgart.de" port 10046',
'"gw05.freifunk-stuttgart.de" port 10047',
'"gw05.freifunk-stuttgart.de" port 10048'
},
},
gw06 = {
key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
remotes = {
'"gw06.freifunk-stuttgart.de" port 10037',
'"gw06.freifunk-stuttgart.de" port 10041',
'"gw06.freifunk-stuttgart.de" port 10042',
'"gw06.freifunk-stuttgart.de" port 10043',
'"gw06.freifunk-stuttgart.de" port 10044',
'"gw06.freifunk-stuttgart.de" port 10045',
'"gw06.freifunk-stuttgart.de" port 10046',
'"gw06.freifunk-stuttgart.de" port 10047',
'"gw06.freifunk-stuttgart.de" port 10048'
},
},
gw07 = {
key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
remotes = {
'"gw07.freifunk-stuttgart.de" port 10037',
'"gw07.freifunk-stuttgart.de" port 10041',
'"gw07.freifunk-stuttgart.de" port 10042',
'"gw07.freifunk-stuttgart.de" port 10043',
'"gw07.freifunk-stuttgart.de" port 10044',
'"gw07.freifunk-stuttgart.de" port 10045',
'"gw07.freifunk-stuttgart.de" port 10046',
'"gw07.freifunk-stuttgart.de" port 10047',
'"gw07.freifunk-stuttgart.de" port 10048'
},
},
gw08 = {
key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
remotes = {
'"gw08.freifunk-stuttgart.de" port 10037',
'"gw08.freifunk-stuttgart.de" port 10041',
'"gw08.freifunk-stuttgart.de" port 10042',
'"gw08.freifunk-stuttgart.de" port 10043',
'"gw08.freifunk-stuttgart.de" port 10044',
'"gw08.freifunk-stuttgart.de" port 10045',
'"gw08.freifunk-stuttgart.de" port 10046',
'"gw08.freifunk-stuttgart.de" port 10047',
'"gw08.freifunk-stuttgart.de" port 10048'
},
},
gw09 = {
key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
remotes = {
'"gw09.freifunk-stuttgart.de" port 10037',
'"gw09.freifunk-stuttgart.de" port 10041',
'"gw09.freifunk-stuttgart.de" port 10042',
'"gw09.freifunk-stuttgart.de" port 10043',
'"gw09.freifunk-stuttgart.de" port 10044',
'"gw09.freifunk-stuttgart.de" port 10045',
'"gw09.freifunk-stuttgart.de" port 10046',
'"gw09.freifunk-stuttgart.de" port 10047',
'"gw09.freifunk-stuttgart.de" port 10048'
},
},
},
},
},
},
autoupdater = {
......@@ -94,34 +191,64 @@
stable = {
name = 'stable',
mirrors = {
'http://[fd21:b4dc:4b1e::a38:1]/gluon/stable/sysupgrade', -- gluongw
'http://[fd21:b4dc:4b1e::a38:1]/gluon/stable/sysupgrade',
'http://[fd21:b4dc:4b00::a38:1]/gluon/stable/sysupgrade',
'http://[fd21:b4dc:4b01::a38:1]/gluon/stable/sysupgrade',
'http://[fd21:b4dc:4b02::a38:1]/gluon/stable/sysupgrade',
'http://[fd21:b4dc:4b03::a38:1]/gluon/stable/sysupgrade',
'http://[fd21:b4dc:4b04::a38:1]/gluon/stable/sysupgrade',
'http://[fd21:b4dc:4b05::a38:1]/gluon/stable/sysupgrade',
'http://[fd21:b4dc:4b06::a38:1]/gluon/stable/sysupgrade',
'http://[fd21:b4dc:4b07::a38:1]/gluon/stable/sysupgrade',
'http://[fd21:b4dc:4b08::a38:1]/gluon/stable/sysupgrade',
},
probability = 0.08,
good_signatures = 1,
good_signatures = 2,
pubkeys = {
'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
'0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
},
},
beta = {
name = 'beta',
mirrors = {
'http://[fd21:b4dc:4b1e::a38:1]/gluon/beta/sysupgrade', -- gluongw
'http://[fd21:b4dc:4b1e::a38:1]/gluon/beta/sysupgrade',
'http://[fd21:b4dc:4b00::a38:1]/gluon/beta/sysupgrade',
'http://[fd21:b4dc:4b01::a38:1]/gluon/beta/sysupgrade',
'http://[fd21:b4dc:4b02::a38:1]/gluon/beta/sysupgrade',
'http://[fd21:b4dc:4b03::a38:1]/gluon/beta/sysupgrade',
'http://[fd21:b4dc:4b04::a38:1]/gluon/beta/sysupgrade',
'http://[fd21:b4dc:4b05::a38:1]/gluon/beta/sysupgrade',
'http://[fd21:b4dc:4b06::a38:1]/gluon/beta/sysupgrade',
'http://[fd21:b4dc:4b07::a38:1]/gluon/beta/sysupgrade',
'http://[fd21:b4dc:4b08::a38:1]/gluon/beta/sysupgrade',
},
probability = 0.1,
good_signatures = 1,
pubkeys = {
'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
'0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
},
},
nightly = {
name = 'nightly',
mirrors = {
'http://[fd21:b4dc:4b1e::a38:1]/gluon/nightly/sysupgrade', -- gluongw
'http://[fd21:b4dc:4b1e::a38:1]/gluon/nightly/sysupgrade',
'http://[fd21:b4dc:4b00::a38:1]/gluon/nightly/sysupgrade',
'http://[fd21:b4dc:4b01::a38:1]/gluon/nightly/sysupgrade',
'http://[fd21:b4dc:4b02::a38:1]/gluon/nightly/sysupgrade',
'http://[fd21:b4dc:4b03::a38:1]/gluon/nightly/sysupgrade',
'http://[fd21:b4dc:4b04::a38:1]/gluon/nightly/sysupgrade',
'http://[fd21:b4dc:4b05::a38:1]/gluon/nightly/sysupgrade',
'http://[fd21:b4dc:4b06::a38:1]/gluon/nightly/sysupgrade',
'http://[fd21:b4dc:4b07::a38:1]/gluon/nightly/sysupgrade',
'http://[fd21:b4dc:4b08::a38:1]/gluon/nightly/sysupgrade',
},
probability = 1.00,
good_signatures = 1,
pubkeys = {
'eb609ccaa68d681aadbc4d00a4b0870f6cb1559ac9d280f590beee595ac4bc39', -- leonard
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
'0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
},
},
},
......@@ -139,42 +266,4 @@
-- enable BATMAN on WAN interface by default (see gluon-luci-portconfig for webinterface)
mesh_on_wan = false,
config_mode = {
msg_welcome = [[
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://gw01.freifunk-stuttgart.de/map" target="_blank">Karte</a> verwenden.
]],
msg_pubkey = [[
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 und den Namen deines Knotens (<em><%=hostname%></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>.
<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>
]],
msg_reboot = [[
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://gw01.freifunk-stuttgart.de/map/">gw01.freifunk-stuttgart.de/map</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>
]],
},
}
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