diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 397ba7fb56..b66d1bcb7f 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -29,7 +29,7 @@ - "85.236.55.6" - "[2001:4178:2:1269::fed2]" - "80.239.156.215" - - "140.211.169.197" + - "140.211.169.196" - "213.175.193.206" - "[2001:2030:0:2::3]" - "67.203.2.67" @@ -48,7 +48,7 @@ - "152.19.134.142" - "80.239.156.215" - "[2610:28:3090:3001:dead:beef:cafe:fed3]" - - "140.211.169.197" + - "140.211.169.196" - "213.175.193.206" - "[2001:2030:0:2::3]" - "67.203.2.67" diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf index e2fd40c0bd..cfedb19f3b 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -28,7 +28,7 @@ NameVirtualHost [2610:28:3090:3001:dead:beef:cafe:fed3]:443 #proxy06 NameVirtualHost 140.211.169.196:80 -NameVirtualHost 140.211.169.197:443 +NameVirtualHost 140.211.169.196:443 #proxy07 NameVirtualHost 213.175.193.205:80 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 4048f6f73a..4eb3e7d93b 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 @@ -158,19 +158,19 @@ define host { # osuosl # -define host { - host_name 140.211.169.197-osuosl - alias 140.211.169.197-osuosl - use defaulttemplate - address 140.211.169.197 - parents proxy06.fedoraproject.org -} +# define host { +# host_name 140.211.169.197-osuosl +# alias 140.211.169.197-osuosl +# use defaulttemplate +# address 140.211.169.197 +# parents proxy06.fedoraproject.org +# } define host { host_name proxy06.fedoraproject.org alias proxy06.fedoraproject.org use defaulttemplate - address 140.211.169.197 + address 140.211.169.196 parents osuosl01.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 dee03458b8..f23e280193 100644 --- a/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg @@ -39,8 +39,8 @@ define host { #} #define host { -# host_name 140.211.169.197-osuosl -# alias 140.211.169.197-osuosl +# host_name proxy06.fedorarproject.org +# alias proxy06.fedorarproject.org # use defaulttemplate # address 140.211.169.197 # parents proxy06.fedoraproject.org diff --git a/roles/nagios_server/files/nagios-external/services/websites.cfg b/roles/nagios_server/files/nagios-external/services/websites.cfg index 67d4515d59..549a3dbd9b 100644 --- a/roles/nagios_server/files/nagios-external/services/websites.cfg +++ b/roles/nagios_server/files/nagios-external/services/websites.cfg @@ -3,7 +3,7 @@ # define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description https max_check_attempts 2 normal_check_interval 2 @@ -13,7 +13,7 @@ define service { define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description bodhi max_check_attempts 8 check_command check_website_ssl!admin.fedoraproject.org!/updates/!Latest @@ -21,14 +21,14 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description pkgdb check_command check_website_ssl!admin.fedoraproject.org!/pkgdb/collections/!EPEL use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description packages max_check_attempts 8 check_command check_website_ssl!apps.fedoraproject.org!/packages/!Packages @@ -36,7 +36,7 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description elections check_command check_website_ssl!admin.fedoraproject.org!/voting/!Last 5 elections use websitetemplate @@ -50,35 +50,35 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description accounts check_command check_website_ssl!admin.fedoraproject.org!/accounts/help/get_help/user_telephone!emergency use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description ask check_command check_website_ssl!ask.fedoraproject.org!/en/questions/!RSS use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description blockerbugs check_command check_website_ssl!qa.fedoraproject.org!/blockerbugs/!Currently Active Milestones use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description fedocal check_command check_website_ssl!apps.fedoraproject.org!/calendar/list/infrastructure-outages/!Description use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description taskotron_taskmaster max_check_attempts 8 check_command check_website_ssl!taskotron.fedoraproject.org!/taskmaster/ @@ -86,7 +86,7 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description taskotron_resultsdb max_check_attempts 8 check_command check_website_ssl!taskotron.fedoraproject.org!/resultsdb/ @@ -94,7 +94,7 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description taskotron_resultsdb_api max_check_attempts 8 check_command check_website_ssl!taskotron.fedoraproject.org!/resultsdb_api/ @@ -106,7 +106,7 @@ define service { # define service { - host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description http max_check_attempts 2 normal_check_interval 2 @@ -115,42 +115,42 @@ define service { } define service { - host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description fedoraproject.org check_command check_website!fedoraproject.org!/!getfedora.org use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description fedoraproject.org - wiki check_command check_website!fedoraproject.org!/wiki/Special:Version!MediaWiki is free software use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description docs.fedoraproject.org check_command check_website!docs.fedoraproject.org!/en-US/index.html!Fedora Documentation use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description mirrors.fedoraproject.org - mirrorlist check_command check_website!mirrors.fedoraproject.org!/mirrorlist?repo=rawhide&arch=x86_64&country=global!development use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.6-internetx, proxy03.fedoraproject.org, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description mirrors.fedoraproject.org - publiclist check_command check_website!mirrors.fedoraproject.org!/publiclist/Fedora/!Fedora Public Active Mirrors use websitetemplate } define service { - host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, 140.211.169.197-osuosl, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach + host_name 209.132.181.16-phx2, 85.236.55.5-internetx, 66.35.62.162-tummy, 152.19.134.142-ibiblio, proxy06.fedoraproject.org, 213.175.193.206-bodhost, 67.203.2.67-coloamerica, 66.135.62.201-serverbeach service_description start.fedoraproject.org check_command check_website!start.fedoraproject.org!/!The Fedora Project is maintained use websitetemplate diff --git a/roles/nagios_server/files/nagios/hosts/proxy06-fpo.cfg b/roles/nagios_server/files/nagios/hosts/proxy06-fpo.cfg index 7febec252c..74289f3b1a 100644 --- a/roles/nagios_server/files/nagios/hosts/proxy06-fpo.cfg +++ b/roles/nagios_server/files/nagios/hosts/proxy06-fpo.cfg @@ -2,6 +2,6 @@ define host { host_name proxy06-fpo alias proxy06-fpo.fedoraproject.org use defaulttemplate - address 140.211.169.197 + address 140.211.169.196 parents proxy06 } diff --git a/roles/nagios_server/files/nagios/hosts/proxy06-wildcard.cfg b/roles/nagios_server/files/nagios/hosts/proxy06-wildcard.cfg index 6262bcf8a5..2c739866f4 100644 --- a/roles/nagios_server/files/nagios/hosts/proxy06-wildcard.cfg +++ b/roles/nagios_server/files/nagios/hosts/proxy06-wildcard.cfg @@ -2,6 +2,6 @@ define host { host_name proxy06-wildcard alias proxy06-wildcard.fedoraproject.org use defaulttemplate - address 140.211.169.197 + address 140.211.169.196 parents proxy06 }