diff --git a/nix/lib/config/legacy.nix b/nix/lib/config/legacy.nix index 4c09bb0..0f8119f 100644 --- a/nix/lib/config/legacy.nix +++ b/nix/lib/config/legacy.nix @@ -131,6 +131,7 @@ in mgmt-gw.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "anon1" "freifunk" ]; bgp.ospf.allowedUpstreams = [ "upstream4" "upstream1" "upstream3" "anon1" "freifunk" ]; anon1.ospf.allowedUpstreams = [ "upstream1" "upstream3" "upstream4" "freifunk" ]; + priv17-gw-up3.ospf.allowedUpstreams = [ "upstream3" "upstream4" "upstream1" "anon1" "freifunk" ]; pub-gw.ospf.allowedUpstreams = [ "anon1" "freifunk" ]; c3d2-anon.ospf.allowedUpstreams = [ "anon1" "freifunk" ]; diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls index 9aa5f91..9e60a46 100644 --- a/salt-pillar/dhcp/init.sls +++ b/salt-pillar/dhcp/init.sls @@ -220,7 +220,7 @@ dhcp: domain-name: priv16.zentralwerk.dn42 priv17: - start: 172.20.73.130 + start: 172.20.73.131 end: 172.20.73.158 time: 120 max-time: 86400 diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls index 017e371..a96d41d 100644 --- a/salt-pillar/hosts/init.sls +++ b/salt-pillar/hosts/init.sls @@ -160,6 +160,7 @@ hosts-inet: c3d2-gw2: 172.20.72.63 c3d2-gw3: 172.20.72.64 priv41-gw: 172.20.72.65 + priv17-gw-up3: 172.20.72.66 pub: pub-gw: 172.20.78.1 @@ -249,6 +250,7 @@ hosts-inet: priv16-gw: 172.20.75.225 priv17: priv17-gw: 172.20.73.129 + priv17-gw-up3: 172.20.73.130 priv18: priv18-gw: 172.20.74.49 priv19: diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls index ed83124..9b66ed4 100644 --- a/salt-pillar/lxc-containers/server1.sls +++ b/salt-pillar/lxc-containers/server1.sls @@ -219,6 +219,15 @@ containers: type: phys hwaddr: 0A:14:48:01:2A:19 + priv17-gw-up3: + interfaces: + core: + type: veth + hwaddr: 0A:14:47:02:2A:18 + priv17: + type: phys + hwaddr: 0A:14:47:02:2A:19 + priv18-gw: interfaces: core: