diff --git a/nix/lib/config/legacy.nix b/nix/lib/config/legacy.nix index 2e82efa..5453c0f 100644 --- a/nix/lib/config/legacy.nix +++ b/nix/lib/config/legacy.nix @@ -102,12 +102,14 @@ in upstream2.ospf.upstreamInstance = 4; anon1.ospf.upstreamInstance = 5; freifunk.ospf.upstreamInstance = 6; - c3d2-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ]; - serv-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ]; - cls-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ]; - mgmt-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ]; - bgp.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ]; - anon1.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ]; + 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" ]; + anon1.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "upstream2" "freifunk" ]; pub-gw.ospf.allowedUpstreams = [ "anon1" "freifunk" ]; c3d2-anon.ospf.allowedUpstreams = [ "anon1" "freifunk" ]; @@ -116,7 +118,7 @@ in # host priv*-gw settings ( builtins.mapAttrs (hostName: _: { - ospf.allowedUpstreams = [ "upstream2" "upstream1" "freifunk" ]; + ospf.allowedUpstreams = [ "upstream4" "upstream2" "upstream3" "upstream1" "freifunk" ]; }) ( lib.filterAttrs (hostName: _: builtins.match "priv[[:digit:]]+-gw" hostName != null diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls index 070a3a0..f4757c6 100644 --- a/salt-pillar/lxc-containers/server1.sls +++ b/salt-pillar/lxc-containers/server1.sls @@ -494,6 +494,24 @@ containers: # modem that is bridge mode hwaddr: 00:23:74:D7:42:7C + upstream3: + interfaces: + core: + type: veth + hwaddr: 0A:14:48:01:28:00 + up3: + type: phys + hwaddr: 00:23:74:D7:42:7D + + upstream4: + interfaces: + core: + type: veth + hwaddr: 0A:14:48:01:29:00 + up4: + type: phys + hwaddr: 00:23:74:D7:42:7E + anon1: interfaces: core: