stefan/site
1
0
Fork 0
forked from Freifunk-Troisdorf/site
Code Pull Requests Activity

Multidomain Bugfix

Browse Source
This commit is contained in:
stebifan 2019-10-13 11:53:12 +02:00
parent 80ab450652
commit 0f9bb2f4bc
4 changed files with 176 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
domains/flu.conf
View File

@ -12,6 +12,7 @@
next_node = { next_node = {
ip4 = '10.188.64.1', ip4 = '10.188.64.1',
ip6 = 'fda0:747e:ab29:7405::1', ip6 = 'fda0:747e:ab29:7405::1',
mac = '04:74:05:d0:4f:aa',
}, },
wifi24 = { wifi24 = {
@ -39,7 +40,7 @@
tunneldigger = { tunneldigger = {
brokers = { brokers = {
'flu1.freifunk-troisdorf.de:53842', 'flu1.freifunk-troisdorf.de:53842',
'flu2.freifunk-troisdorf.de:53840' 'flu2.freifunk-troisdorf.de:53840',
}, },
}, },
}, },

4
domains/inn.conf
View File

@ -5,13 +5,13 @@
flu = 'Soziale Netze', flu = 'Soziale Netze',
}, },
domain_seed = '884f7f15965ec522dfd4c74195798eabf5bd3734406d80d7c5af7521d441fb4a', domain_seed = '884f7f15965ec522dfd4c74195798eabf5bd3734406d80d7c5af7521d441fb4a',
prefix4 = '10.188.32.0/19', prefix4 = '10.188.32.0/19',
prefix6 = 'fda0:747e:ab29:7405::/64', prefix6 = 'fda0:747e:ab29:7405::/64',
next_node = { next_node = {
ip4 = '10.188.32.1', ip4 = '10.188.32.1',
ip6 = 'fda0:747e:ab29:7405::1', ip6 = 'fda0:747e:ab29:7405::1',
mac = '04:74:05:d0:4f:aa',
}, },
wifi24 = { wifi24 = {
@ -39,7 +39,7 @@
tunneldigger = { tunneldigger = {
brokers = { brokers = {
'inn1.freifunk-troisdorf.de:53842', 'inn1.freifunk-troisdorf.de:53842',
'inn2.freifunk-troisdorf.de:53840' 'inn2.freifunk-troisdorf.de:53840',
}, },
}, },
}, },

3
domains/tdf.conf
View File

@ -10,6 +10,7 @@
next_node = { next_node = {
ip4 = '10.188.0.1', ip4 = '10.188.0.1',
ip6 = 'fda0:747e:ab29:7405::1', ip6 = 'fda0:747e:ab29:7405::1',
mac = '04:74:05:d0:4f:aa',
}, },
wifi24 = { wifi24 = {
@ -37,7 +38,7 @@
tunneldigger = { tunneldigger = {
brokers = { brokers = {
'tdf1.freifunk-troisdorf.de:53842', 'tdf1.freifunk-troisdorf.de:53842',
'tdf2.freifunk-troisdorf.de:53840' 'tdf2.freifunk-troisdorf.de:53840',
}, },
}, },
}, },

5
site.conf
View File

@ -3,7 +3,6 @@
site_name = 'Freifunk Troisdorf', site_name = 'Freifunk Troisdorf',
site_code = 'tdf', site_code = 'tdf',
default_domain = 'tdf', default_domain = 'tdf',
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 = {
'ntp1.infra.fftdf', 'ntp1.infra.fftdf',
@ -23,14 +22,12 @@
}, },
}, },
}, },
wifi24 = { wifi24 = {
channel = 5, channel = 5,
mesh = { mesh = {
mcast_rate = 12000, mcast_rate = 12000,
}, },
}, },
wifi5 = { wifi5 = {
channel = 44, channel = 44,
outdoor_chanlist = "100-140", outdoor_chanlist = "100-140",
@ -38,7 +35,6 @@
mcast_rate = 12000, mcast_rate = 12000,
}, },
}, },
autoupdater = { autoupdater = {
enabled = true, enabled = true,
branch = 'stable', branch = 'stable',
@ -61,7 +57,6 @@
'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880', -- Nils 'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880', -- Nils
'9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f', -- Lars '9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f', -- Lars
'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2' -- Michael 'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2' -- Michael
}, },
}, },
beta = { beta = {