allowedUpstreams: add anon1 everywhere

because ipv4/ipv6 are configured together but switch independently,
anon1 can be working when upstream* has broken ipv6.
This commit is contained in:
Astro 2021-05-27 03:01:09 +02:00
parent 74dc00961b
commit 57df325207
1 changed files with 6 additions and 6 deletions

View File

@ -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