diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -2048,7 +2048,7 @@ exempted_networks: - 127.0.0.0/8 - 192.168.100.0/23 - - 128.93.193.29 + - 128.93.166.14 - 131.107.174.0/24 # OpenAIRE - 213.135.60.145 @@ -2073,7 +2073,7 @@ exempted_networks: - 127.0.0.0/8 - 192.168.100.0/23 - - 128.93.193.29 + - 128.93.166.14 - 131.107.174.0/24 # OpenAIRE - 213.135.60.145 @@ -2087,7 +2087,7 @@ exempted_networks: - 127.0.0.0/8 - 192.168.100.0/23 - - 128.93.193.29 + - 128.93.166.14 - 131.107.174.0/24 # OpenAIRE - 213.135.60.145 diff --git a/data/hostname/moma.softwareheritage.org.yaml b/data/hostname/moma.softwareheritage.org.yaml --- a/data/hostname/moma.softwareheritage.org.yaml +++ b/data/hostname/moma.softwareheritage.org.yaml @@ -1,26 +1,13 @@ networks: eth0: - address: 128.93.193.31 - netmask: 255.255.255.0 - ups: - - ip rule add from 128.93.193.31 table vlan220 - - ip route add 128.93.193.0/24 src 128.93.193.31 dev $IFACE table vlan220 - - ip route add default via 128.93.193.254 dev $IFACE table vlan220 - - ip route flush cache - downs: - - ip route del default via 128.93.193.254 dev $IFACE table vlan220 - - ip route del 128.93.193.0/24 src 128.93.193.31 dev $IFACE table vlan220 - - ip rule del from 128.93.193.31 table vlan220 - - ip route flush cache + address: 128.93.166.15 + netmask: 26 + gateway: 128.93.166.62 eth1: type: private address: 192.168.100.31 netmask: 255.255.255.0 gateway: 192.168.100.1 - eth2: - address: 128.93.166.15 - netmask: 26 - gateway: 128.93.166.62 backups::exclude: - var/lib/rabbitmq diff --git a/data/hostname/pergamon.softwareheritage.org.yaml b/data/hostname/pergamon.softwareheritage.org.yaml --- a/data/hostname/pergamon.softwareheritage.org.yaml +++ b/data/hostname/pergamon.softwareheritage.org.yaml @@ -17,27 +17,14 @@ networks: eth0: - address: 128.93.193.29 - netmask: 255.255.255.0 - ups: - - ip rule add from 128.93.193.29 table vlan220 - - ip route add 128.93.193.0/24 src 128.93.193.29 dev $IFACE table vlan220 - - ip route add default via 128.93.193.254 dev $IFACE table vlan220 - - ip route flush cache - downs: - - ip route del default via 128.93.193.254 dev $IFACE table vlan220 - - ip route del 128.93.193.0/24 src 128.93.193.29 dev $IFACE table vlan220 - - ip rule del from 128.93.193.29 table vlan220 - - ip route flush cache + address: 128.93.166.14 + netmask: 26 + gateway: 128.93.166.62 eth1: type: private address: 192.168.100.29 netmask: 255.255.255.0 gateway: 192.168.100.1 - eth2: - address: 128.93.166.14 - netmask: 26 - gateway: 128.93.166.62 networks::private_routes: staging_legacy: diff --git a/data/hostname/tate.softwareheritage.org.yaml b/data/hostname/tate.softwareheritage.org.yaml --- a/data/hostname/tate.softwareheritage.org.yaml +++ b/data/hostname/tate.softwareheritage.org.yaml @@ -10,27 +10,14 @@ networks: eth0: - address: 128.93.193.30 - netmask: 255.255.255.0 - ups: - - ip rule add from 128.93.193.30 table vlan220 - - ip route add 128.93.193.0/24 src 128.93.193.30 dev $IFACE table vlan220 - - ip route add default via 128.93.193.254 dev $IFACE table vlan220 - - ip route flush cache - downs: - - ip route del default via 128.93.193.254 dev $IFACE table vlan220 - - ip route del 128.93.193.0/24 src 128.93.193.30 dev $IFACE table vlan220 - - ip rule del from 128.93.193.30 table vlan220 - - ip route flush cache + address: 128.93.166.12 + netmask: 26 + gateway: 128.93.166.62 eth1: type: private address: 192.168.100.30 netmask: 255.255.255.0 gateway: 192.168.100.1 - eth2: - address: 128.93.166.12 - netmask: 26 - gateway: 128.93.166.62 apache::rewrite_domains: # Must have matching certificates in letsencrypt::certificates