From 0f9bb2f4bcb7f4d39093b7278cb6b9b18d3522ab Mon Sep 17 00:00:00 2001 From: stebifan Date: Sun, 13 Oct 2019 11:53:12 +0200 Subject: [PATCH] Multidomain Bugfix --- domains/flu.conf | 35 +++---- domains/inn.conf | 36 +++---- domains/tdf.conf | 35 +++---- site.conf | 249 +++++++++++++++++++++++------------------------ 4 files changed, 176 insertions(+), 179 deletions(-) diff --git a/domains/flu.conf b/domains/flu.conf index 7d6261b..8907b1e 100644 --- a/domains/flu.conf +++ b/domains/flu.conf @@ -10,36 +10,37 @@ prefix6 = 'fda0:747e:ab29:7405::/64', next_node = { - ip4 = '10.188.64.1', - ip6 = 'fda0:747e:ab29:7405::1', + ip4 = '10.188.64.1', + ip6 = 'fda0:747e:ab29:7405::1', + mac = '04:74:05:d0:4f:aa', }, - + wifi24 = { - ap = { - ssid = 'Freifunk', - }, - mesh = { - id = 'troisdorf-flu-mesh', - }, + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-flu-mesh', + }, }, wifi5 = { - ap = { - ssid = 'Freifunk', - }, - mesh = { - id = 'troisdorf-flu-mesh', - }, + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-flu-mesh', + }, }, mesh = { - vxlan = false, + vxlan = false, }, mesh_vpn = { tunneldigger = { brokers = { 'flu1.freifunk-troisdorf.de:53842', - 'flu2.freifunk-troisdorf.de:53840' + 'flu2.freifunk-troisdorf.de:53840', }, }, }, diff --git a/domains/inn.conf b/domains/inn.conf index 9b72be5..c651614 100644 --- a/domains/inn.conf +++ b/domains/inn.conf @@ -5,41 +5,41 @@ flu = 'Soziale Netze', }, domain_seed = '884f7f15965ec522dfd4c74195798eabf5bd3734406d80d7c5af7521d441fb4a', - prefix4 = '10.188.32.0/19', prefix6 = 'fda0:747e:ab29:7405::/64', next_node = { - ip4 = '10.188.32.1', - ip6 = 'fda0:747e:ab29:7405::1', + ip4 = '10.188.32.1', + ip6 = 'fda0:747e:ab29:7405::1', + mac = '04:74:05:d0:4f:aa', }, wifi24 = { - ap = { - ssid = 'Freifunk', - }, - mesh = { - id = 'troisdorf-inn-mesh', - }, + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-inn-mesh', + }, }, wifi5 = { - ap = { - ssid = 'Freifunk', - }, - mesh = { - id = 'troisdorf-inn-mesh', - }, + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-inn-mesh', + }, }, - + mesh = { - vxlan = false, + vxlan = false, }, mesh_vpn = { tunneldigger = { brokers = { 'inn1.freifunk-troisdorf.de:53842', - 'inn2.freifunk-troisdorf.de:53840' + 'inn2.freifunk-troisdorf.de:53840', }, }, }, diff --git a/domains/tdf.conf b/domains/tdf.conf index b34acfb..4dbb6f1 100644 --- a/domains/tdf.conf +++ b/domains/tdf.conf @@ -8,36 +8,37 @@ prefix4 = '10.188.0.0/19', prefix6 = 'fda0:747e:ab29:7405::/64', next_node = { - ip4 = '10.188.0.1', - ip6 = 'fda0:747e:ab29:7405::1', + ip4 = '10.188.0.1', + ip6 = 'fda0:747e:ab29:7405::1', + mac = '04:74:05:d0:4f:aa', }, wifi24 = { - ap = { - ssid = 'Freifunk', - }, - mesh = { - id = 'troisdorf-tdf-mesh', - }, + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-tdf-mesh', + }, }, wifi5 = { - ap = { - ssid = 'Freifunk', - }, - mesh = { - id = 'troisdorf-tdf-mesh', - }, + ap = { + ssid = 'Freifunk', + }, + mesh = { + id = 'troisdorf-tdf-mesh', + }, }, - + mesh = { - vxlan = false, + vxlan = false, }, mesh_vpn = { tunneldigger = { brokers = { 'tdf1.freifunk-troisdorf.de:53842', - 'tdf2.freifunk-troisdorf.de:53840' + 'tdf2.freifunk-troisdorf.de:53840', }, }, }, diff --git a/site.conf b/site.conf index 8fc68d3..9589f0d 100644 --- a/site.conf +++ b/site.conf @@ -1,136 +1,131 @@ { - hostname_prefix = 'tdf', - site_name = 'Freifunk Troisdorf', - site_code = 'tdf', - default_domain = 'tdf', + hostname_prefix = 'tdf', + site_name = 'Freifunk Troisdorf', + site_code = '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 - ntp_servers = { - 'ntp1.infra.fftdf', - 'ntp2.infra.fftdf', - '0.de.pool.ntp.org', - '1.de.pool.ntp.org', - }, - 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 - }, - }, - }, + 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 + }, + }, + }, + }, + mesh = { batman_adv = { - gw_sel_class = 3, - routing_algo = 'BATMAN_IV', - }, + gw_sel_class = 3, + routing_algo = 'BATMAN_IV', + }, + }, + roles = { + default = 'node', + list = { + 'node', + 'test', + 'backbone', + 'mesh', + 'meshanduplink', + 'nightswitch', + 'service', + 'uplink', }, - roles = { - default = 'node', - list = { - 'node', - 'test', - 'backbone', - 'mesh', - 'meshanduplink', - 'nightswitch', - 'service', - 'uplink', - }, + }, + config_mode = { + geo_location = { + show_altitude = false, }, - config_mode = { - geo_location = { - show_altitude = false, - }, - owner = { - obligatory = true - }, + owner = { + obligatory = true }, + }, } \ No newline at end of file