diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 746395b6b5..a5f88ce857 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -23,7 +23,6 @@ - "80.239.156.214" - "152.19.134.142" - "[2610:28:3090:3001:dead:beef:cafe:fed3]" - - "213.175.193.205" - "[2001:2030:0:2::2]" - "10.5.126.51" - "10.5.126.52" diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf index 8d4dc00990..ff987c753e 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -31,8 +31,6 @@ NameVirtualHost 140.211.169.196:80 NameVirtualHost 140.211.169.196:443 #proxy07 -NameVirtualHost 213.175.193.205:80 -NameVirtualHost 213.175.193.205:443 NameVirtualHost 213.175.193.206:80 NameVirtualHost 213.175.193.206:443 diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index a6ad6fa4f8..85b1600d87 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -352,7 +352,7 @@ $wgSquidServers = array( "192.168.1.63", # proxy07 - "213.175.193.205", + "213.175.193.206", "192.168.1.52", # proxy08 diff --git a/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg b/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg index 5812406989..59448f2a63 100644 --- a/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/admin.fedoraproject.org.cfg @@ -187,7 +187,7 @@ define host { host_name proxy07.fedoraproject.org alias proxy07.fedoraproject.org use defaulttemplate - address 213.175.193.205 + address 213.175.193.206 parents bodhost01.fedoraproject.org } diff --git a/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg b/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg index 75e1682d49..4574927c74 100644 --- a/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg @@ -46,13 +46,13 @@ define host { # parents proxy06.fedoraproject.org #} -define host { - host_name 213.175.193.205-bodhost - alias 213.175.193.205-bodhost - use defaulttemplate - address 213.175.193.205 - parents proxy07.fedoraproject.org -} +#define host { +# host_name 213.175.193.205-bodhost +# alias 213.175.193.205-bodhost +# use defaulttemplate +# address 213.175.193.205 +# parents proxy07.fedoraproject.org +#} define host { host_name 67.203.2.67-coloamerica diff --git a/roles/nagios_server/files/nagios/hosts/proxy07-fpo.cfg b/roles/nagios_server/files/nagios/hosts/proxy07-fpo.cfg index 00157be721..5faa0a77de 100644 --- a/roles/nagios_server/files/nagios/hosts/proxy07-fpo.cfg +++ b/roles/nagios_server/files/nagios/hosts/proxy07-fpo.cfg @@ -2,6 +2,6 @@ define host { host_name proxy07-fpo alias proxy07-fpo.fedoraproject.org use defaulttemplate - address 213.175.193.205 + address 213.175.193.206 parents proxy07 }