diff --git a/inventory/host_vars/proxy38.fedoraproject.org b/inventory/host_vars/proxy38.fedoraproject.org index bf7dbcdf4c..31f53e72b2 100644 --- a/inventory/host_vars/proxy38.fedoraproject.org +++ b/inventory/host_vars/proxy38.fedoraproject.org @@ -13,5 +13,5 @@ nrpe_procs_crit: 1400 nagios_Check_Services: swap: false -public_ip: 13.212.45.87 +public_ip: 13.212.97.102 diff --git a/inventory/host_vars/proxy39.fedoraproject.org b/inventory/host_vars/proxy39.fedoraproject.org new file mode 100644 index 0000000000..b9ed8297aa --- /dev/null +++ b/inventory/host_vars/proxy39.fedoraproject.org @@ -0,0 +1,17 @@ +--- +# Skipping all the network stuff. Amazon does that all via DHCP. + +# This is consumed by the roles/fedora-web/main role +sponsor: amazon +datacenter: aws +postfix_group: vpn +vpn: true + +nrpe_procs_warn: 1200 +nrpe_procs_crit: 1400 + +nagios_Check_Services: + swap: false + +public_ip: 13.244.109.203 + diff --git a/inventory/host_vars/proxy40.fedoraproject.org b/inventory/host_vars/proxy40.fedoraproject.org new file mode 100644 index 0000000000..28462dcc86 --- /dev/null +++ b/inventory/host_vars/proxy40.fedoraproject.org @@ -0,0 +1,17 @@ +--- +# Skipping all the network stuff. Amazon does that all via DHCP. + +# This is consumed by the roles/fedora-web/main role +sponsor: amazon +datacenter: aws +postfix_group: vpn +vpn: true + +nrpe_procs_warn: 1200 +nrpe_procs_crit: 1400 + +nagios_Check_Services: + swap: false + +public_ip: 15.228.51.95 + diff --git a/inventory/inventory b/inventory/inventory index 4e372bd853..aac186a434 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -354,6 +354,8 @@ proxy35.fedoraproject.org proxy36.fedoraproject.org proxy37.fedoraproject.org proxy38.fedoraproject.org +proxy39.fedoraproject.org +proxy40.fedoraproject.org proxy101.iad2.fedoraproject.org proxy110.iad2.fedoraproject.org @@ -503,6 +505,8 @@ proxy35.fedoraproject.org proxy36.fedoraproject.org proxy37.fedoraproject.org proxy38.fedoraproject.org +proxy39.fedoraproject.org +proxy40.fedoraproject.org [proxies_internal] proxy101.iad2.fedoraproject.org diff --git a/roles/openvpn/server/files/ccd/proxy39.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy39.fedoraproject.org new file mode 100644 index 0000000000..b67eb80fcd --- /dev/null +++ b/roles/openvpn/server/files/ccd/proxy39.fedoraproject.org @@ -0,0 +1,3 @@ +# ifconfig-push actualIP PtPIP +ifconfig-push 192.168.1.199 192.168.0.199 + diff --git a/roles/openvpn/server/files/ccd/proxy40.fedoraproject.org b/roles/openvpn/server/files/ccd/proxy40.fedoraproject.org new file mode 100644 index 0000000000..7aa42fec2c --- /dev/null +++ b/roles/openvpn/server/files/ccd/proxy40.fedoraproject.org @@ -0,0 +1,3 @@ +# ifconfig-push actualIP PtPIP +ifconfig-push 192.168.1.200 192.168.0.200 +