diff --git a/nix/lib/config/legacy.nix b/nix/lib/config/legacy.nix index ff0b8b7..58896f2 100644 --- a/nix/lib/config/legacy.nix +++ b/nix/lib/config/legacy.nix @@ -76,16 +76,20 @@ in services.dnscache.enable = true; }; - c3d2-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" ]; - serv-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" ]; - cls-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" ]; - mgmt-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" ]; - bgp.ospf.allowedUpstreams = [ "upstream1" "upstream2" ]; + 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" ]; + + pub-gw.ospf.allowedUpstreams = [ "anon1" "freifunk" ]; + c3d2-anon.ospf.allowedUpstreams = [ "anon1" "freifunk" ]; } ( builtins.mapAttrs (hostName: _: { - ospf.allowedUpstreams = [ "upstream2" "upstream1" ]; + ospf.allowedUpstreams = [ "upstream2" "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 be80f7b..070a3a0 100644 --- a/salt-pillar/lxc-containers/server1.sls +++ b/salt-pillar/lxc-containers/server1.sls @@ -3,8 +3,8 @@ containers: interfaces: core: type: veth - gw: anon1 - gw6: anon1 + # gw: anon1 + # gw6: anon1 hwaddr: 0A:14:48:01:16:00 pub: type: veth @@ -515,8 +515,8 @@ containers: interfaces: core: type: veth - gw: anon1 - gw6: anon1 + # gw: anon1 + # gw6: anon1 hwaddr: 0A:14:48:01:07:01 c3d2: type: veth