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

merged master_segmentierung to master

parents cabc0b52 e4e8bef0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 117 additions and 17 deletions
site.conf
+ 117
− 17
View file @ 869c3f5c
......@@ -4,16 +4,16 @@
site_code = 'ffs',
prefix4 = '172.21.0.0/18',
prefix6 = 'fd21:b4dc:4b1e::/64',
prefix6 = 'fd21:711::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {
'fd21:b4dc:4b1e::a38:1', -- gw01
'fd21:b4dc:4b00::a38:1', -- gw01
},
regdom = 'DE',
wifi24 = {
channel = 1,
htmode = 'HT20', --only for optic
......@@ -43,7 +43,7 @@
next_node = {
ip4 = '172.21.24.254',
ip6 = 'fd21:b4dc:4b1e::1',
ip6 = 'fd21:711::1',
mac = '02:00:0a:25:00:01',
},
......@@ -57,43 +57,143 @@
peers = {
gw01 = {
key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
remotes = {'"gw01.freifunk-stuttgart.de" port 10037'},
remotes = {
'"gw01.freifunk-stuttgart.de" port 10037',
'"gw01s01.freifunk-stuttgart.de" port 10041',
'"gw01s02.freifunk-stuttgart.de" port 10042',
'"gw01s03.freifunk-stuttgart.de" port 10043',
'"gw01s04.freifunk-stuttgart.de" port 10044',
'"gw01s05.freifunk-stuttgart.de" port 10045',
'"gw01s06.freifunk-stuttgart.de" port 10046',
'"gw01s07.freifunk-stuttgart.de" port 10047',
'"gw01s08.freifunk-stuttgart.de" port 10048'
},
},
gw02 = {
key = 'b694b4646f4fa7cb027f3786993c6c8b9062d1357fa7257bd3210706cffc565a',
remotes = {'"gw02.freifunk-stuttgart.de" port 10037'},
remotes = {
'"gw02.freifunk-stuttgart.de" port 10037',
'"gw02s01.freifunk-stuttgart.de" port 10041',
'"gw02s02.freifunk-stuttgart.de" port 10042',
'"gw02s03.freifunk-stuttgart.de" port 10043',
'"gw02s04.freifunk-stuttgart.de" port 10044',
'"gw02s05.freifunk-stuttgart.de" port 10045',
'"gw02s06.freifunk-stuttgart.de" port 10046',
'"gw02s07.freifunk-stuttgart.de" port 10047',
'"gw02s08.freifunk-stuttgart.de" port 10048'
},
},
gw03 = {
key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
remotes = {'"gw03.freifunk-stuttgart.de" port 10037'},
remotes = {
'"gw03.freifunk-stuttgart.de" port 10037',
'"gw03s01.freifunk-stuttgart.de" port 10041',
'"gw03s02.freifunk-stuttgart.de" port 10042',
'"gw03s03.freifunk-stuttgart.de" port 10043',
'"gw03s04.freifunk-stuttgart.de" port 10044',
'"gw03s05.freifunk-stuttgart.de" port 10045',
'"gw03s06.freifunk-stuttgart.de" port 10046',
'"gw03s07.freifunk-stuttgart.de" port 10047',
'"gw03s08.freifunk-stuttgart.de" port 10048'
},
},
gw04 = {
key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
remotes = {'"gw04.freifunk-stuttgart.de" port 10037'},
remotes = {
'"gw04.freifunk-stuttgart.de" port 10037',
'"gw04s01.freifunk-stuttgart.de" port 10041',
'"gw04s02.freifunk-stuttgart.de" port 10042',
'"gw04s03.freifunk-stuttgart.de" port 10043',
'"gw04s04.freifunk-stuttgart.de" port 10044',
'"gw04s05.freifunk-stuttgart.de" port 10045',
'"gw04s06.freifunk-stuttgart.de" port 10046',
'"gw04s07.freifunk-stuttgart.de" port 10047',
'"gw04s08.freifunk-stuttgart.de" port 10048'
},
},
gw05 = {
key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
remotes = {'"gw05.freifunk-stuttgart.de" port 10037'},
remotes = {
'"gw05.freifunk-stuttgart.de" port 10037',
'"gw05s01.freifunk-stuttgart.de" port 10041',
'"gw05s02.freifunk-stuttgart.de" port 10042',
'"gw05s03.freifunk-stuttgart.de" port 10043',
'"gw05s04.freifunk-stuttgart.de" port 10044',
'"gw05s05.freifunk-stuttgart.de" port 10045',
'"gw05s06.freifunk-stuttgart.de" port 10046',
'"gw05s07.freifunk-stuttgart.de" port 10047',
'"gw05s08.freifunk-stuttgart.de" port 10048'
},
},
gw06 = {
key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
remotes = {'"gw06.freifunk-stuttgart.de" port 10037'},
remotes = {
'"gw06.freifunk-stuttgart.de" port 10037',
'"gw06s01.freifunk-stuttgart.de" port 10041',
'"gw06s02.freifunk-stuttgart.de" port 10042',
'"gw06s03.freifunk-stuttgart.de" port 10043',
'"gw06s04.freifunk-stuttgart.de" port 10044',
'"gw06s05.freifunk-stuttgart.de" port 10045',
'"gw06s06.freifunk-stuttgart.de" port 10046',
'"gw06s07.freifunk-stuttgart.de" port 10047',
'"gw06s08.freifunk-stuttgart.de" port 10048'
},
},
gw07 = {
key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
remotes = {'"gw07.freifunk-stuttgart.de" port 10037'},
remotes = {
'"gw07.freifunk-stuttgart.de" port 10037',
'"gw07s01.freifunk-stuttgart.de" port 10041',
'"gw07s02.freifunk-stuttgart.de" port 10042',
'"gw07s03.freifunk-stuttgart.de" port 10043',
'"gw07s04.freifunk-stuttgart.de" port 10044',
'"gw07s05.freifunk-stuttgart.de" port 10045',
'"gw07s06.freifunk-stuttgart.de" port 10046',
'"gw07s07.freifunk-stuttgart.de" port 10047',
'"gw07s08.freifunk-stuttgart.de" port 10048'
},
},
gw08 = {
key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
remotes = {'"gw08.freifunk-stuttgart.de" port 10037'},
remotes = {
'"gw08.freifunk-stuttgart.de" port 10037',
'"gw08s01.freifunk-stuttgart.de" port 10041',
'"gw08s02.freifunk-stuttgart.de" port 10042',
'"gw08s03.freifunk-stuttgart.de" port 10043',
'"gw08s04.freifunk-stuttgart.de" port 10044',
'"gw08s05.freifunk-stuttgart.de" port 10045',
'"gw08s06.freifunk-stuttgart.de" port 10046',
'"gw08s07.freifunk-stuttgart.de" port 10047',
'"gw08s08.freifunk-stuttgart.de" port 10048'
},
},
gw09 = {
key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
remotes = {'"gw09.freifunk-stuttgart.de" port 10037'},
remotes = {
'"gw09.freifunk-stuttgart.de" port 10037',
'"gw09s01.freifunk-stuttgart.de" port 10041',
'"gw09s02.freifunk-stuttgart.de" port 10042',
'"gw09s03.freifunk-stuttgart.de" port 10043',
'"gw09s04.freifunk-stuttgart.de" port 10044',
'"gw09s05.freifunk-stuttgart.de" port 10045',
'"gw09s06.freifunk-stuttgart.de" port 10046',
'"gw09s07.freifunk-stuttgart.de" port 10047',
'"gw09s08.freifunk-stuttgart.de" port 10048'
},
},
gw10 = {
key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
remotes = {'"gw10.freifunk-stuttgart.de" port 10037'},
remotes = {
'"gw10.freifunk-stuttgart.de" port 10037',
'"gw10s01.freifunk-stuttgart.de" port 10041',
'"gw10s02.freifunk-stuttgart.de" port 10042',
'"gw10s03.freifunk-stuttgart.de" port 10043',
'"gw10s04.freifunk-stuttgart.de" port 10044',
'"gw10s05.freifunk-stuttgart.de" port 10045',
'"gw10s06.freifunk-stuttgart.de" port 10046',
'"gw10s07.freifunk-stuttgart.de" port 10047',
'"gw10s08.freifunk-stuttgart.de" port 10048'
},
},
},
},
......@@ -114,7 +214,7 @@
stable = {
name = 'stable',
mirrors = {
'http://[fd21:b4dc:4b1e::a38:1]/gluon/stable/sysupgrade', -- gluongw
'http://[fd21:b4dc:4b00::a38:1]/gluon/stable/images/sysupgrade', -- gw01
},
good_signatures = 2,
pubkeys = {
......@@ -126,7 +226,7 @@
beta = {
name = 'beta',
mirrors = {
'http://[fd21:b4dc:4b1e::a38:1]/gluon/beta/sysupgrade', -- gluongw
'http://[fd21:b4dc:4b00::a38:1]/gluon/beta/images/sysupgrade', -- gw01
},
good_signatures = 1,
pubkeys = {
......@@ -138,7 +238,7 @@
nightly = {
name = 'nightly',
mirrors = {
'http://[fd21:b4dc:4b1e::a38:1]/gluon/nightly/sysupgrade', -- gluongw
'http://[fd21:b4dc:4b00::a38:1]/gluon/nightly/images/sysupgrade', -- gw01
},
good_signatures = 1,
pubkeys = {
......
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