diff --git a/inventory/host_vars/proxy03.fedoraproject.org b/inventory/host_vars/proxy03.fedoraproject.org index b580fac4fc..ffe781e292 100644 --- a/inventory/host_vars/proxy03.fedoraproject.org +++ b/inventory/host_vars/proxy03.fedoraproject.org @@ -1,22 +1,22 @@ --- -nm: 255.255.255.240 -gw: 66.35.62.174 -dns: 198.49.126.1 -mem_size: 4096 -max_mem_size: 4096 +eth0_ip: 8.43.85.73 +eth0_nm: 255.255.255.0 +gw: 8.43.85.254 +nm: 255.255.255.0 +dns: 8.8.8.8 + +mem_size: 8192 +max_mem_size: 8192 ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora-29-ext ks_repo: http://infrastructure.fedoraproject.org/pub/fedora/linux/releases/29/Server/x86_64/os/ -vmhost: tummy01.fedoraproject.org -volgroup: /dev/vg_host - -eth0_ip: 66.35.62.162 -eth0_nm: 255.255.255.240 +vmhost: virthost-cc-rdu02.fedoraproject.org +volgroup: /dev/vg_guests # This is consumed by the roles/fedora-web/main role -sponsor: tummy -datacenter: tummy +sponsor: redhat +datacenter: rdu-cc postfix_group: vpn vpn: true @@ -26,4 +26,4 @@ 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: 400 +maxrequestworkers: 900 diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf index eed8d387b6..1914108f78 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -13,8 +13,8 @@ NameVirtualHost [2001:4178:2:1269::fed2]:80 NameVirtualHost [2001:4178:2:1269::fed2]:443 # proxy03 -NameVirtualHost 66.35.62.162:80 -NameVirtualHost 66.35.62.162:443 +NameVirtualHost 8.43.85.73:80 +NameVirtualHost 8.43.85.73:443 # proxy04 NameVirtualHost 152.19.134.142:80 diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index 7f22b8d696..681372f053 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -369,7 +369,7 @@ $wgSquidServersNoPurge = array( "192.168.1.12", # proxy03 - "66.35.62.162", + "8.43.85.73", "192.168.1.7", # proxy04 diff --git a/roles/mediawiki123/templates/LocalSettings.php.fp.j2 b/roles/mediawiki123/templates/LocalSettings.php.fp.j2 index 33f9322cd4..e0f49c2a1a 100644 --- a/roles/mediawiki123/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki123/templates/LocalSettings.php.fp.j2 @@ -340,7 +340,7 @@ $wgSquidServersNoPurge = array( "192.168.1.12", # proxy03 - "66.35.62.162", + "8.43.85.73", "192.168.1.7", # proxy04 diff --git a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg index 20f3ecdec2..b2129a23eb 100644 --- a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg +++ b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg @@ -1,7 +1,7 @@ define servicedependency { host_name proxy03.fedoraproject.org - service_description https + service_description https dependent_host_name proxy03.fedoraproject.org dependent_service_description bodhi, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org notification_failure_criteria w,c @@ -10,7 +10,7 @@ define servicedependency { define servicedependency { host_name 209.132.181.16-phx2 - service_description https + service_description https dependent_host_name 209.132.181.16-phx2 dependent_service_description bodhi, 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 @@ -19,7 +19,7 @@ define servicedependency { define servicedependency { host_name 152.19.134.142-ibiblio - service_description https + service_description https dependent_host_name 152.19.134.142-ibiblio dependent_service_description bodhi, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org notification_failure_criteria w,c @@ -28,7 +28,7 @@ define servicedependency { define servicedependency { host_name 152.19.134.198-ibiblio - service_description https + service_description https dependent_host_name 152.19.134.198-ibiblio dependent_service_description bodhi, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org notification_failure_criteria w,c @@ -37,7 +37,7 @@ define servicedependency { define servicedependency { host_name 85.236.55.6-internetx - service_description https + service_description https dependent_host_name 85.236.55.6-internetx dependent_service_description bodhi, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org notification_failure_criteria w,c @@ -46,7 +46,7 @@ define servicedependency { define servicedependency { host_name 67.203.2.67-coloamerica - service_description https + service_description https dependent_host_name 67.203.2.67-coloamerica dependent_service_description bodhi, 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 @@ -54,27 +54,27 @@ define servicedependency { } define servicedependency { - host_name 66.35.62.162-tummy - service_description http - dependent_host_name 66.35.62.162-tummy + host_name 8.43.85.73-virthost-cc-rdu02 + service_description http + dependent_host_name 8.43.85.73-virthost-cc-rdu02 dependent_service_description fedoraproject.org, fedoraproject.org - wiki, start.fedoraproject.org notification_failure_criteria w,c execution_failure_criteria w,c } define servicedependency { - host_name 152.19.134.142-ibiblio - service_description http - dependent_host_name 152.19.134.142-ibiblio + host_name 152.19.134.142-ibiblio + service_description http + dependent_host_name 152.19.134.142-ibiblio dependent_service_description fedoraproject.org, fedoraproject.org - wiki, start.fedoraproject.org notification_failure_criteria w,c execution_failure_criteria w,c } define servicedependency { - host_name 152.19.134.198-ibiblio - service_description http - dependent_host_name 152.19.134.198-ibiblio + host_name 152.19.134.198-ibiblio + service_description http + dependent_host_name 152.19.134.198-ibiblio dependent_service_description fedoraproject.org, fedoraproject.org - wiki, start.fedoraproject.org notification_failure_criteria w,c execution_failure_criteria w,c