diff --git a/domains/flu.conf b/domains/flu.conf index 211de06..7d6261b 100644 --- a/domains/flu.conf +++ b/domains/flu.conf @@ -12,10 +12,9 @@ next_node = { ip4 = '10.188.64.1', ip6 = 'fda0:747e:ab29:7405::1', - mac = '04:74:05:d0:4f:aa', }, + wifi24 = { - channel = 5, ap = { ssid = 'Freifunk', }, @@ -23,9 +22,8 @@ id = 'troisdorf-flu-mesh', }, }, + wifi5 = { - channel = 44, - outdoor_chanlist = '100-140', ap = { ssid = 'Freifunk', }, @@ -33,6 +31,7 @@ id = 'troisdorf-flu-mesh', }, }, + mesh = { vxlan = false, }, diff --git a/domains/inn.conf b/domains/inn.conf index b694122..9b72be5 100644 --- a/domains/inn.conf +++ b/domains/inn.conf @@ -12,10 +12,9 @@ next_node = { ip4 = '10.188.32.1', ip6 = 'fda0:747e:ab29:7405::1', - mac = '04:74:05:d0:4f:aa', }, + wifi24 = { - channel = 5, ap = { ssid = 'Freifunk', }, @@ -23,9 +22,8 @@ id = 'troisdorf-inn-mesh', }, }, + wifi5 = { - channel = 44, - outdoor_chanlist = '100-140', ap = { ssid = 'Freifunk', }, @@ -33,6 +31,7 @@ id = 'troisdorf-inn-mesh', }, }, + mesh = { vxlan = false, }, diff --git a/domains/tdf.conf b/domains/tdf.conf index 98e8347..b34acfb 100644 --- a/domains/tdf.conf +++ b/domains/tdf.conf @@ -10,10 +10,9 @@ next_node = { ip4 = '10.188.0.1', ip6 = 'fda0:747e:ab29:7405::1', - mac = '04:74:05:d0:4f:aa', }, + wifi24 = { - channel = 5, ap = { ssid = 'Freifunk', }, @@ -21,9 +20,8 @@ id = 'troisdorf-tdf-mesh', }, }, + wifi5 = { - channel = 44, - outdoor_chanlist = '100-140', ap = { ssid = 'Freifunk', }, @@ -31,6 +29,7 @@ id = 'troisdorf-tdf-mesh', }, }, + mesh = { vxlan = false, }, diff --git a/site.conf b/site.conf index 7d5e709..8fc68d3 100644 --- a/site.conf +++ b/site.conf @@ -12,6 +12,33 @@ '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', @@ -85,16 +112,6 @@ routing_algo = 'BATMAN_IV', }, }, - mesh_vpn = { - mtu = 1312, - tunneldigger = { - bandwidth_limit = { - enabled = false, - egress = 2000, - ingress = 6000, - }, - }, - }, roles = { default = 'node', list = {