diff --git a/inventory/host_vars/proxy09.fedoraproject.org b/inventory/host_vars/proxy09.fedoraproject.org new file mode 100644 index 0000000000..5894e546c5 --- /dev/null +++ b/inventory/host_vars/proxy09.fedoraproject.org @@ -0,0 +1,36 @@ +--- +nm: 255.255.255.0 +gw: 192.168.122.1 +dns: 8.8.8.8 + +volgroup: /dev/vg_host +eth0_ip: 192.168.122.2 +vmhost: serverbeach07.fedoraproject.org +datacenter: serverbeach + +postfix_group: vpn + +# This uses a different virt-install due to wacky serverbeach network/setup +virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} + --disk {{ volgroup }}/{{ inventory_hostname }} + --vcpus={{ num_cpus }} -l {{ ks_repo }} -x + "ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} + gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0 + hostname={{ inventory_hostname }}" + --autostart --noautoconsole + +ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext +ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ + +# This is consumed by the roles/fedora-web/main role +sponsor: serverbeach +postfix_group: vpn + +mem_size: 6144 +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +# This is used in the httpd.conf to determine the value for serverlimit and +# maxrequestworkers. On 8gb proxies, 900 seems fine. But on 4gb proxies, this +# should be lowered in the host vars for that proxy. +maxrequestworkers: 600 diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 45dbb17ce2..764845c844 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -1,7 +1,7 @@ # create a new proxy server - name: make new proxy server - hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org + hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org:proxy09.fedoraproject.org user: root gather_facts: False @@ -17,7 +17,7 @@ - include: "{{ handlers }}/restart_services.yml" - name: make the box be real - hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org + hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org:proxy09.fedoraproject.org user: root gather_facts: True @@ -73,7 +73,7 @@ - name: Set up the proxy basics - hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org + hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org:proxy09.fedoraproject.org user: root gather_facts: False diff --git a/playbooks/include/proxies-certificates.yml b/playbooks/include/proxies-certificates.yml index 851d9853b5..bcf4ed4915 100644 --- a/playbooks/include/proxies-certificates.yml +++ b/playbooks/include/proxies-certificates.yml @@ -1,5 +1,5 @@ - name: Set up those proxy certificates. Good gravy.. - hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org + hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org:proxy09.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml index bbdd2bdce4..d98f127d71 100644 --- a/playbooks/include/proxies-fedora-web.yml +++ b/playbooks/include/proxies-fedora-web.yml @@ -1,5 +1,5 @@ - name: Set up all that fedora-web goodness. What a wonder! - hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org + hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org:proxy09.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/include/proxies-haproxy.yml b/playbooks/include/proxies-haproxy.yml index 9e2999e4e5..0a45e0b075 100644 --- a/playbooks/include/proxies-haproxy.yml +++ b/playbooks/include/proxies-haproxy.yml @@ -1,5 +1,5 @@ - name: Set up all the haproxy stuff. - hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org + hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org:proxy09.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/include/proxies-miscellaneous.yml b/playbooks/include/proxies-miscellaneous.yml index d14179866a..d23a187378 100644 --- a/playbooks/include/proxies-miscellaneous.yml +++ b/playbooks/include/proxies-miscellaneous.yml @@ -1,5 +1,5 @@ - name: Set up all the other proxy stuff -- miscellaneous - hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org + hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org:proxy09.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml index 000dc6e1c0..4866b237fc 100644 --- a/playbooks/include/proxies-redirects.yml +++ b/playbooks/include/proxies-redirects.yml @@ -1,5 +1,5 @@ - name: Set up those proxy redirects. Wow! - hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org + hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org:proxy09.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 9a6772d732..49799204c3 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -1,5 +1,5 @@ - name: Set up those ProxyPassReverse statements. Somebody get me a cup of coffee.. - hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org + hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org:proxy09.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/include/proxies-rewrites.yml b/playbooks/include/proxies-rewrites.yml index ba79507e54..dba4c8548c 100644 --- a/playbooks/include/proxies-rewrites.yml +++ b/playbooks/include/proxies-rewrites.yml @@ -1,5 +1,5 @@ - name: Set up some domain rewrites. - hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org + hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org:proxy09.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index 8fbfe090de..ac241605b1 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -1,5 +1,5 @@ - name: Set up those proxy websites. My, my.. - hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org + hosts: proxies-stg:proxy03.fedoraproject.org:proxy04.fedoraproject.org:proxy06.fedoraproject.org:proxy08.fedoraproject.org:proxy09.fedoraproject.org user: root gather_facts: True 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 6c086629ba..453275b83d 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 @@ -269,6 +269,6 @@ define host { host_name proxy09.fedoraproject.org alias proxy09.fedoraproject.org use defaulttemplate - address 66.135.62.201 + address 66.135.62.187 parents serverbeach06.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 f23e280193..75e1682d49 100644 --- a/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/fedoraproject.org.cfg @@ -71,9 +71,9 @@ define host { } define host { - host_name 66.135.62.201-serverbeach - alias 66.135.62.201-serverbeach + host_name 66.135.62.187-serverbeach + alias 66.135.62.187-serverbeach use defaulttemplate - address 66.135.62.201 + address 66.135.62.187 parents proxy09.fedoraproject.org } diff --git a/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg b/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg index e59e0d2424..533f991ce7 100644 --- a/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg +++ b/roles/nagios_server/files/nagios-external/servicedeps/websitedeps.cfg @@ -45,9 +45,9 @@ define servicedependency { } define servicedependency { - host_name 66.135.62.201-serverbeach + host_name 66.135.62.187-serverbeach service_description https - dependent_host_name 66.135.62.201-serverbeach + dependent_host_name 66.135.62.187-serverbeach dependent_service_description bodhi, pkgdb, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts, fedoraproject.org, fedoraproject.org - wiki notification_failure_criteria w,c execution_failure_criteria w,c diff --git a/roles/nagios_server/files/nagios-external/services/websites.cfg b/roles/nagios_server/files/nagios-external/services/websites.cfg index 549a3dbd9b..84f7bfb237 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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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, proxy06.fedoraproject.org, 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.187-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/proxy09-fpo.cfg b/roles/nagios_server/files/nagios/hosts/proxy09-fpo.cfg index d92c50dea8..a20d388320 100644 --- a/roles/nagios_server/files/nagios/hosts/proxy09-fpo.cfg +++ b/roles/nagios_server/files/nagios/hosts/proxy09-fpo.cfg @@ -2,6 +2,6 @@ define host { host_name proxy09-fpo alias proxy09-fpo.fedoraproject.org use defaulttemplate - address 66.135.62.201 + address 66.135.62.187 parents proxy09 } diff --git a/roles/nagios_server/files/nagios/hosts/proxy09-wildcard.cfg b/roles/nagios_server/files/nagios/hosts/proxy09-wildcard.cfg index 50262f806e..140a9e1933 100644 --- a/roles/nagios_server/files/nagios/hosts/proxy09-wildcard.cfg +++ b/roles/nagios_server/files/nagios/hosts/proxy09-wildcard.cfg @@ -2,6 +2,6 @@ define host { host_name proxy09-wildcard alias proxy09-wildcard.fedoraproject.org use defaulttemplate - address 66.135.62.201 + address 66.135.62.187 parents proxy09 } diff --git a/roles/nagios_server/files/nagios/hosts/proxy09.cfg b/roles/nagios_server/files/nagios/hosts/proxy09.cfg index ab5e6328a7..46f77ed813 100644 --- a/roles/nagios_server/files/nagios/hosts/proxy09.cfg +++ b/roles/nagios_server/files/nagios/hosts/proxy09.cfg @@ -3,5 +3,5 @@ define host { alias proxy09.fedoraproject.org use defaulttemplate address proxy09.fedoraproject.org - parents serverbeach06 + parents serverbeach07 }