From 16eed252153bc28461011862acc361e49d7b900a Mon Sep 17 00:00:00 2001 From: stebifan Date: Wed, 9 Oct 2019 22:53:07 +0200 Subject: [PATCH] Bugfix Multidomain --- domains/flu.conf | 5 ----- domains/inn.conf | 5 ----- domains/tdf.conf | 7 ------- site.conf | 9 +++++++-- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/domains/flu.conf b/domains/flu.conf index a6d839d..211de06 100644 --- a/domains/flu.conf +++ b/domains/flu.conf @@ -35,10 +35,6 @@ }, mesh = { vxlan = false, - batman_adv = { - gw_sel_class = 3, - routing_algo = 'BATMAN_IV', - }, }, mesh_vpn = { tunneldigger = { @@ -48,5 +44,4 @@ }, }, }, - } \ No newline at end of file diff --git a/domains/inn.conf b/domains/inn.conf index 5e22a49..b694122 100644 --- a/domains/inn.conf +++ b/domains/inn.conf @@ -35,10 +35,6 @@ }, mesh = { vxlan = false, - batman_adv = { - gw_sel_class = 3, - routing_algo = 'BATMAN_IV', - }, }, mesh_vpn = { tunneldigger = { @@ -48,5 +44,4 @@ }, }, }, - } \ No newline at end of file diff --git a/domains/tdf.conf b/domains/tdf.conf index 5d40894..98e8347 100644 --- a/domains/tdf.conf +++ b/domains/tdf.conf @@ -5,10 +5,8 @@ flu = 'Soziale Netze', }, domain_seed = '9a38c49fc5069254c7588a551e6b781691600055fce54777c31e051c3ff84352', - 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', @@ -35,10 +33,6 @@ }, mesh = { vxlan = false, - batman_adv = { - gw_sel_class = 3, - routing_algo = 'BATMAN_IV', - }, }, mesh_vpn = { tunneldigger = { @@ -48,5 +42,4 @@ }, }, }, - } \ No newline at end of file diff --git a/site.conf b/site.conf index 149f2c9..d0c8f8f 100644 --- a/site.conf +++ b/site.conf @@ -79,6 +79,11 @@ }, }, }, + mesh = { + batman_adv = { + gw_sel_class = 3, + routing_algo = 'BATMAN_IV', + }, mesh_vpn = { mtu = 1312, tunneldigger = { @@ -88,7 +93,7 @@ ingress = 6000, }, }, - }, + }, roles = { default = 'node', list = { @@ -110,4 +115,4 @@ obligatory = true }, }, - } + } \ No newline at end of file