From 57df325207013ab76cec72a3c59fb84a9f63c3e8 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 27 May 2021 03:01:09 +0200 Subject: [PATCH] allowedUpstreams: add anon1 everywhere because ipv4/ipv6 are configured together but switch independently, anon1 can be working when upstream* has broken ipv6. --- nix/lib/config/legacy.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nix/lib/config/legacy.nix b/nix/lib/config/legacy.nix index 7fb429f..7cf7884 100644 --- a/nix/lib/config/legacy.nix +++ b/nix/lib/config/legacy.nix @@ -112,11 +112,11 @@ in freifunk.ospf.upstreamInstance = 6; upstream3.ospf.upstreamInstance = 7; upstream4.ospf.upstreamInstance = 8; - c3d2-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ]; - serv-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ]; - cls-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ]; - mgmt-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ]; - bgp.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ]; + c3d2-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; + serv-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; + cls-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; + mgmt-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; + bgp.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; anon1.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ]; pub-gw.ospf.allowedUpstreams = [ "anon1" "freifunk" ]; @@ -126,7 +126,7 @@ in # host priv*-gw settings ( builtins.mapAttrs (hostName: _: { - ospf.allowedUpstreams = [ "upstream4" "upstream2" "upstream3" "upstream1" "freifunk" ]; + ospf.allowedUpstreams = [ "upstream4" "upstream2" "upstream3" "upstream1" "anon1" "freifunk" ]; }) ( lib.filterAttrs (hostName: _: builtins.match "priv[[:digit:]]+-gw" hostName != null