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

35
domains/flu.conf
View File

@ -10,36 +10,37 @@
prefix6 = 'fda0:747e:ab29:7405::/64', prefix6 = 'fda0:747e:ab29:7405::/64',
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 = {
ap = { ap = {
ssid = 'Freifunk', ssid = 'Freifunk',
}, },
mesh = { mesh = {
id = 'troisdorf-flu-mesh', id = 'troisdorf-flu-mesh',
}, },
}, },
wifi5 = { wifi5 = {
ap = { ap = {
ssid = 'Freifunk', ssid = 'Freifunk',
}, },
mesh = { mesh = {
id = 'troisdorf-flu-mesh', id = 'troisdorf-flu-mesh',
}, },
}, },
mesh = { mesh = {
vxlan = false, vxlan = false,
}, },
mesh_vpn = { mesh_vpn = {
tunneldigger = { tunneldigger = {
brokers = { brokers = {
'flu1.freifunk-troisdorf.de:53842', 'flu1.freifunk-troisdorf.de:53842',
'flu2.freifunk-troisdorf.de:53840' 'flu2.freifunk-troisdorf.de:53840',
}, },
}, },
}, },

36
domains/inn.conf
View File

@ -5,41 +5,41 @@
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 = {
ap = { ap = {
ssid = 'Freifunk', ssid = 'Freifunk',
}, },
mesh = { mesh = {
id = 'troisdorf-inn-mesh', id = 'troisdorf-inn-mesh',
}, },
}, },
wifi5 = { wifi5 = {
ap = { ap = {
ssid = 'Freifunk', ssid = 'Freifunk',
}, },
mesh = { mesh = {
id = 'troisdorf-inn-mesh', id = 'troisdorf-inn-mesh',
}, },
}, },
mesh = { mesh = {
vxlan = false, vxlan = false,
}, },
mesh_vpn = { mesh_vpn = {
tunneldigger = { tunneldigger = {
brokers = { brokers = {
'inn1.freifunk-troisdorf.de:53842', 'inn1.freifunk-troisdorf.de:53842',
'inn2.freifunk-troisdorf.de:53840' 'inn2.freifunk-troisdorf.de:53840',
}, },
}, },
}, },

35
domains/tdf.conf
View File

@ -8,36 +8,37 @@
prefix4 = '10.188.0.0/19', prefix4 = '10.188.0.0/19',
prefix6 = 'fda0:747e:ab29:7405::/64', prefix6 = 'fda0:747e:ab29:7405::/64',
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 = {
ap = { ap = {
ssid = 'Freifunk', ssid = 'Freifunk',
}, },
mesh = { mesh = {
id = 'troisdorf-tdf-mesh', id = 'troisdorf-tdf-mesh',
}, },
}, },
wifi5 = { wifi5 = {
ap = { ap = {
ssid = 'Freifunk', ssid = 'Freifunk',
}, },
mesh = { mesh = {
id = 'troisdorf-tdf-mesh', id = 'troisdorf-tdf-mesh',
}, },
}, },
mesh = { mesh = {
vxlan = false, vxlan = false,
}, },
mesh_vpn = { mesh_vpn = {
tunneldigger = { tunneldigger = {
brokers = { brokers = {
'tdf1.freifunk-troisdorf.de:53842', 'tdf1.freifunk-troisdorf.de:53842',
'tdf2.freifunk-troisdorf.de:53840' 'tdf2.freifunk-troisdorf.de:53840',
}, },
}, },
}, },

249
site.conf
View File

@ -1,136 +1,131 @@
{ {
hostname_prefix = 'tdf', hostname_prefix = 'tdf',
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
ntp_servers = {
'ntp1.infra.fftdf',
'ntp2.infra.fftdf',
'0.de.pool.ntp.org',
'1.de.pool.ntp.org',
},
regdom = 'DE',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin mesh_vpn = {
ntp_servers = { mtu = 1312,
'ntp1.infra.fftdf', tunneldigger = {
'ntp2.infra.fftdf', bandwidth_limit = {
'0.de.pool.ntp.org', enabled = false,
'1.de.pool.ntp.org', egress = 2000,
}, ingress = 6000,
regdom = 'DE', },
mesh_vpn = {
mtu = 1312,
tunneldigger = {
bandwidth_limit = {
enabled = false,
egress = 2000,
ingress = 6000,
},
},
},
wifi24 = {
channel = 5,
mesh = {
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
outdoor_chanlist = "100-140",
mesh = {
mcast_rate = 12000,
},
},
autoupdater = {
enabled = true,
branch = 'stable',
branches = {
stable = {
name = 'stable',
mirrors = {
'http://update1.infra.fftdf/multi/stable/sysupgrade',
'http://update2.infra.fftdf/multi/stable/sysupgrade',
'http://images.freifunk-troisdorf.de/multi/stable/sysupgrade'
},
good_signatures = 2,
pubkeys = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14', -- Thorsten
'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0', -- Marconi
'a6cf4b071947876c2a414d89ba6eb31065a30ccbce75c5ffdd760f00b1013792', -- Roman
'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880', -- Nils
'9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f', -- Lars
'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2' -- Michael
},
},
beta = {
name = 'beta',
mirrors = {
'http://update1.infra.fftdf/multi/beta/sysupgrade',
'http://update2.infra.fftdf/multi/beta/sysupgrade',
'http://images.freifunk-troisdorf.de/multi/beta/sysupgrade'
},
good_signatures = 2,
pubkeys = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14', -- Thorsten
'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0', -- Marconi
'a6cf4b071947876c2a414d89ba6eb31065a30ccbce75c5ffdd760f00b1013792', -- Roman
'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880', -- Nils
'9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f', -- Lars
'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2' -- Michael
},
},
experimental = {
name = 'experimental',
mirrors = {
'http://update1.infra.fftdf/multi/experimental/sysupgrade',
'http://update2.infra.fftdf/multi/experimental/sysupgrade',
'http://images.freifunk-troisdorf.de/multi/experimental/sysupgrade'
},
good_signatures = 2,
pubkeys = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14', -- Thorsten
'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0', -- Marconi
'a6cf4b071947876c2a414d89ba6eb31065a30ccbce75c5ffdd760f00b1013792', -- Roman
'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880', -- Nils
'9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f', -- Lars
'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2' -- Michael
},
},
},
}, },
},
wifi24 = {
channel = 5,
mesh = { mesh = {
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
outdoor_chanlist = "100-140",
mesh = {
mcast_rate = 12000,
},
},
autoupdater = {
enabled = true,
branch = 'stable',
branches = {
stable = {
name = 'stable',
mirrors = {
'http://update1.infra.fftdf/multi/stable/sysupgrade',
'http://update2.infra.fftdf/multi/stable/sysupgrade',
'http://images.freifunk-troisdorf.de/multi/stable/sysupgrade'
},
good_signatures = 2,
pubkeys = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14', -- Thorsten
'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0', -- Marconi
'a6cf4b071947876c2a414d89ba6eb31065a30ccbce75c5ffdd760f00b1013792', -- Roman
'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880', -- Nils
'9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f', -- Lars
'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2' -- Michael
},
},
beta = {
name = 'beta',
mirrors = {
'http://update1.infra.fftdf/multi/beta/sysupgrade',
'http://update2.infra.fftdf/multi/beta/sysupgrade',
'http://images.freifunk-troisdorf.de/multi/beta/sysupgrade'
},
good_signatures = 2,
pubkeys = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14', -- Thorsten
'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0', -- Marconi
'a6cf4b071947876c2a414d89ba6eb31065a30ccbce75c5ffdd760f00b1013792', -- Roman
'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880', -- Nils
'9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f', -- Lars
'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2' -- Michael
},
},
experimental = {
name = 'experimental',
mirrors = {
'http://update1.infra.fftdf/multi/experimental/sysupgrade',
'http://update2.infra.fftdf/multi/experimental/sysupgrade',
'http://images.freifunk-troisdorf.de/multi/experimental/sysupgrade'
},
good_signatures = 2,
pubkeys = {
'2647b9fec75e130e153728ee8fad14b24764f23637eb9f3b0a68f2a279a74914', -- Stefan
'98be9ceda320d469db01262ede69820b6ac245bf96433cf99b66726cc04fecf7', -- Kemal
'40f4e0d70ad87dda6ec60e454f9fdf6bd203c89615ff89bd33c365391ffabbe0', -- Reka
'043b3112de38c7495264f8f871fa9c56f88c23794a9e3dd5d654ad93f535dd14', -- Thorsten
'fdf72a54d63f153f590c4bf96a82ef194ca1b6ed0757547f61f85e87a4e42cd0', -- Marconi
'a6cf4b071947876c2a414d89ba6eb31065a30ccbce75c5ffdd760f00b1013792', -- Roman
'd4a16e3cde00dae7367a60cc0600a9de19cf948c7800356d009f740d4da76880', -- Nils
'9caea944ee5eb223896828205a74558701fca8377b7703cce44fdcea8059195f', -- Lars
'ffe2c6102a51754e25fd1f2fd5ef0c93823a2e4d7e90cb29df927c1e9a8f9ec2' -- Michael
},
},
},
},
mesh = {
batman_adv = { batman_adv = {
gw_sel_class = 3, gw_sel_class = 3,
routing_algo = 'BATMAN_IV', routing_algo = 'BATMAN_IV',
}, },
},
roles = {
default = 'node',
list = {
'node',
'test',
'backbone',
'mesh',
'meshanduplink',
'nightswitch',
'service',
'uplink',
}, },
roles = { },
default = 'node', config_mode = {
list = { geo_location = {
'node', show_altitude = false,
'test',
'backbone',
'mesh',
'meshanduplink',
'nightswitch',
'service',
'uplink',
},
}, },
config_mode = { owner = {
geo_location = { obligatory = true
show_altitude = false,
},
owner = {
obligatory = true
},
}, },
},
} }