zentralwerk/network
zentralwerk
/
network
12
4
Fork 2
Code Issues 3 Pull Requests 1 Releases Wiki Activity

allowedUpstreams: remove upstream2, use upstream1 for anon1

This commit is contained in:
Astro 2021-06-02 23:44:55 +02:00
parent 41a7f05c50
commit 96da13020f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nix/lib/config/legacy.nix
View File

@ -123,14 +123,14 @@ in
freifunk.ospf.upstreamInstance = 6; freifunk.ospf.upstreamInstance = 6;
upstream3.ospf.upstreamInstance = 7; upstream3.ospf.upstreamInstance = 7;
upstream4.ospf.upstreamInstance = 8; upstream4.ospf.upstreamInstance = 8;
c3d2-gw1.ospf.allowedUpstreams = [ "upstream3" "upstream4" "upstream1" "upstream2" "anon1" "freifunk" ]; c3d2-gw1.ospf.allowedUpstreams = [ "upstream3" "upstream4" "upstream1" "anon1" "freifunk" ];
c3d2-gw2.ospf.allowedUpstreams = [ "upstream1" "upstream3" "upstream4" "upstream2" "anon1" "freifunk" ]; c3d2-gw2.ospf.allowedUpstreams = [ "upstream1" "upstream3" "upstream4" "anon1" "freifunk" ];
c3d2-gw3.ospf.allowedUpstreams = [ "upstream4" "upstream3" "upstream1" "upstream2" "anon1" "freifunk" ]; c3d2-gw3.ospf.allowedUpstreams = [ "upstream4" "upstream3" "upstream1" "anon1" "freifunk" ];
serv-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; serv-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "anon1" "freifunk" ];
cls-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; cls-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "anon1" "freifunk" ];
mgmt-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; mgmt-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "anon1" "freifunk" ];
bgp.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "anon1" "freifunk" ]; bgp.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "anon1" "freifunk" ];
anon1.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ]; anon1.ospf.allowedUpstreams = [ "upstream1" "upstream3" "upstream4" "freifunk" ];
pub-gw.ospf.allowedUpstreams = [ "anon1" "freifunk" ]; pub-gw.ospf.allowedUpstreams = [ "anon1" "freifunk" ];
c3d2-anon.ospf.allowedUpstreams = [ "anon1" "freifunk" ]; c3d2-anon.ospf.allowedUpstreams = [ "anon1" "freifunk" ];
@ -207,7 +207,7 @@ in
# host priv*-gw settings # host priv*-gw settings
( (
builtins.mapAttrs (hostName: _: { builtins.mapAttrs (hostName: _: {
ospf.allowedUpstreams = [ "upstream4" "upstream2" "upstream3" "upstream1" "anon1" "freifunk" ]; ospf.allowedUpstreams = [ "upstream4" "upstream3" "upstream1" "anon1" "freifunk" ];
}) ( }) (
lib.filterAttrs (hostName: _: lib.filterAttrs (hostName: _:
builtins.match "priv[[:digit:]]+-gw" hostName != null builtins.match "priv[[:digit:]]+-gw" hostName != null