From 4fe0981401494f09d835bbcd2210fe15f5fb75c3 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 16 Jan 2017 01:01:45 +0000 Subject: [PATCH] we need to do all this stuff in templates. --- roles/base/files/syncHttpLogs.sh | 2 ++ .../epylog/files/merged/modules.d/rsyncd.conf | 2 +- ...rm01-builder22.arm.fedoraproject.org-hosts | 2 +- ...rm01-builder23.arm.fedoraproject.org-hosts | 2 +- ...uildvm-01.stg.phx2.fedoraproject.org-hosts | 2 +- ...uildvm-02.stg.phx2.fedoraproject.org-hosts | 2 +- ...uildvm-03.stg.phx2.fedoraproject.org-hosts | 2 +- ...uildvm-04.stg.phx2.fedoraproject.org-hosts | 2 +- ...uildvm-05.stg.phx2.fedoraproject.org-hosts | 2 +- .../composer.stg.phx2.fedoraproject.org-hosts | 2 +- ...backend01.stg.phx2.fedoraproject.org-hosts | 2 +- ...db-koji01.stg.phx2.fedoraproject.org-hosts | 2 +- ...db-koji02.stg.phx2.fedoraproject.org-hosts | 2 +- .../fedimg01.stg.phx2.fedoraproject.org-hosts | 2 +- ...hotness01.stg.phx2.fedoraproject.org-hosts | 2 +- ...ackages03.stg.phx2.fedoraproject.org-hosts | 2 +- .../proxy01.stg.phx2.fedoraproject.org-hosts | 2 +- roles/hosts/files/staging-hosts | 2 +- ...backend01.stg.phx2.fedoraproject.org-hosts | 2 +- ...undries01.stg.phx2.fedoraproject.org-hosts | 2 +- .../proxy/templates/00-namevirtualhost.conf | 25 +++++++++++++++++++ .../templates/LocalSettings.php.fp.j2 | 4 +++ 22 files changed, 50 insertions(+), 19 deletions(-) diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index 2111170c0e..10c26ef739 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -34,7 +34,9 @@ syncHttpLogs proxy03.vpn.fedoraproject.org syncHttpLogs proxy04.vpn.fedoraproject.org syncHttpLogs proxy05.vpn.fedoraproject.org syncHttpLogs proxy06.vpn.fedoraproject.org +syncHttpLogs proxy07.vpn.fedoraproject.org syncHttpLogs proxy08.vpn.fedoraproject.org +syncHttpLogs proxy09.vpn.fedoraproject.org syncHttpLogs proxy10.phx2.fedoraproject.org syncHttpLogs proxy11.vpn.fedoraproject.org syncHttpLogs proxy12.vpn.fedoraproject.org diff --git a/roles/epylog/files/merged/modules.d/rsyncd.conf b/roles/epylog/files/merged/modules.d/rsyncd.conf index 5fb159d428..b90821a886 100644 --- a/roles/epylog/files/merged/modules.d/rsyncd.conf +++ b/roles/epylog/files/merged/modules.d/rsyncd.conf @@ -12,5 +12,5 @@ priority = 7 # Report this many "top ranking hosts" # report_top = 10 -ignore_hosts = log01.vpn.fedoraproject.org log01.phx2.fedoraproject.org proxy01.phx2.fedoraproject.org proxy02.vpn.fedoraproject.org proxy03.vpn.fedoraproject.org proxy04.vpn.fedoraproject.org proxy05.vpn.fedoraproject.org proxy06.vpn.fedoraproject.org proxy08.vpn.fedoraproject.org proxy10.phx2.fedoraproject.org proxy11.phx2.fedoraproject.org collab04.fedoraproject.org hosted04.fedoraproject.org admin.fedoraproject.org proxy01.stg.phx2.fedoraproject.org +ignore_hosts = log01.vpn.fedoraproject.org log01.phx2.fedoraproject.org proxy01.phx2.fedoraproject.org proxy02.vpn.fedoraproject.org proxy03.vpn.fedoraproject.org proxy04.vpn.fedoraproject.org proxy05.vpn.fedoraproject.org proxy06.vpn.fedoraproject.org proxy07.vpn.fedoraproject.org proxy08.vpn.fedoraproject.org proxy09.vpn.fedoraproject.org proxy10.phx2.fedoraproject.org proxy11.phx2.fedoraproject.org proxy12.vpn.fedoraproject.org proxy13.vpn.fedoraproject.org proxy14.vpn.fedoraproject.org collab04.fedoraproject.org hosted04.fedoraproject.org admin.fedoraproject.org proxy01.stg.phx2.fedoraproject.org diff --git a/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts b/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts index 8cf6f59728..d2253ca39e 100644 --- a/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts +++ b/roles/hosts/files/arm01-builder22.arm.fedoraproject.org-hosts @@ -4,7 +4,7 @@ # Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't # synced to staging in a meaningful way. See /usr/local/bin/updatecrl.sh 209.132.181.16 admin.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org diff --git a/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts b/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts index 99341a4797..0c77717e10 100644 --- a/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts +++ b/roles/hosts/files/arm01-builder23.arm.fedoraproject.org-hosts @@ -4,7 +4,7 @@ # Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't # synced to staging in a meaningful way. See /usr/local/bin/updatecrl.sh 209.132.181.16 admin.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org diff --git a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts index 52e5f958df..8aa1e9f152 100644 --- a/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-01.stg.phx2.fedoraproject.org-hosts @@ -4,7 +4,7 @@ # Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't # synced to staging in a meaningful way. See /usr/local/bin/updatecrl.sh 209.132.181.16 admin.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org diff --git a/roles/hosts/files/buildvm-02.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-02.stg.phx2.fedoraproject.org-hosts index 8cf6f59728..4e34cbd6d6 100644 --- a/roles/hosts/files/buildvm-02.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-02.stg.phx2.fedoraproject.org-hosts @@ -4,7 +4,7 @@ # Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't # synced to staging in a meaningful way. See /usr/local/bin/updatecrl.sh 209.132.181.16 admin.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org diff --git a/roles/hosts/files/buildvm-03.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-03.stg.phx2.fedoraproject.org-hosts index 8cf6f59728..4e34cbd6d6 100644 --- a/roles/hosts/files/buildvm-03.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-03.stg.phx2.fedoraproject.org-hosts @@ -4,7 +4,7 @@ # Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't # synced to staging in a meaningful way. See /usr/local/bin/updatecrl.sh 209.132.181.16 admin.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org diff --git a/roles/hosts/files/buildvm-04.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-04.stg.phx2.fedoraproject.org-hosts index 8cf6f59728..4e34cbd6d6 100644 --- a/roles/hosts/files/buildvm-04.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-04.stg.phx2.fedoraproject.org-hosts @@ -4,7 +4,7 @@ # Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't # synced to staging in a meaningful way. See /usr/local/bin/updatecrl.sh 209.132.181.16 admin.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org diff --git a/roles/hosts/files/buildvm-05.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/buildvm-05.stg.phx2.fedoraproject.org-hosts index 8cf6f59728..4e34cbd6d6 100644 --- a/roles/hosts/files/buildvm-05.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/buildvm-05.stg.phx2.fedoraproject.org-hosts @@ -4,7 +4,7 @@ # Use admin.fedoraproject.org so we can get a fresh CRL from prod - it isn't # synced to staging in a meaningful way. See /usr/local/bin/updatecrl.sh 209.132.181.16 admin.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.126.85 db02.stg.fedoraproject.org diff --git a/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts index f7345dfaf1..1703c1161e 100644 --- a/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/composer.stg.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/darkserver-backend01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/darkserver-backend01.stg.phx2.fedoraproject.org-hosts index 0f05dd597b..c3bfae69d0 100644 --- a/roles/hosts/files/darkserver-backend01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/darkserver-backend01.stg.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/db-koji01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/db-koji01.stg.phx2.fedoraproject.org-hosts index 3585f2d8c8..91f50a3ce0 100644 --- a/roles/hosts/files/db-koji01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/db-koji01.stg.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/db-koji02.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/db-koji02.stg.phx2.fedoraproject.org-hosts index 3585f2d8c8..91f50a3ce0 100644 --- a/roles/hosts/files/db-koji02.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/db-koji02.stg.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts index c43a3face7..6c13cab34c 100644 --- a/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/fedimg01.stg.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts index b84bc84dcd..bdf8561fd0 100644 --- a/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/hotness01.stg.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.125.44 pkgs.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts index 7cfd032090..81abe6f3ff 100644 --- a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts @@ -2,7 +2,7 @@ ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.23 puppet.fedoraproject.org puppet puppet01 puppet01.phx2.fedoraproject.org -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org pkgs pkgs01 10.5.126.81 app01.phx2.fedoraproject.org app1 app3 app5 bapp1 app01 app03 app05 bapp01 bapp02 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/proxy01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/proxy01.stg.phx2.fedoraproject.org-hosts index 43cb3bcec3..b8591c639c 100644 --- a/roles/hosts/files/proxy01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/proxy01.stg.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/staging-hosts b/roles/hosts/files/staging-hosts index fd1fc0847a..291c20af03 100644 --- a/roles/hosts/files/staging-hosts +++ b/roles/hosts/files/staging-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 diff --git a/roles/hosts/files/statscache-backend01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/statscache-backend01.stg.phx2.fedoraproject.org-hosts index 3e7caad435..e7b18cdedc 100644 --- a/roles/hosts/files/statscache-backend01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/statscache-backend01.stg.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.stg.fedoraproject.org 10.5.126.51 apps.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org diff --git a/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts index 488d794418..dce4b8edbd 100644 --- a/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/sundries01.stg.phx2.fedoraproject.org-hosts @@ -1,7 +1,7 @@ 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 ::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy11 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.stg.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 fedoraproject.org admin.fedoraproject.org admin.stg.fedoraproject.org apps.stg.fedoraproject.org 10.5.126.23 infrastructure.fedoraproject.org 10.5.126.83 pkgs.fedoraproject.org 10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf index 7665f6d374..95bc93d419 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -32,12 +32,22 @@ NameVirtualHost [2a00:d1a0:1::131]:443 NameVirtualHost 140.211.169.196:80 NameVirtualHost 140.211.169.196:443 +#proxy07 +NameVirtualHost 174.141.234.172:80 +NameVirtualHost 174.141.234.172:443 + #proxy08 NameVirtualHost 67.203.2.67:80 NameVirtualHost 67.203.2.67:443 NameVirtualHost [2607:f188::dead:beef:cafe:fed1]:80 NameVirtualHost [2607:f188::dead:beef:cafe:fed1]:443 +#proxy09 +NameVirtualHost 140.211.169.206:80 +NameVirtualHost 140.211.169.206:443 +NameVirtualHost [2605:bc80:3010:600:dead:beef:cafe:feda]:80 +NameVirtualHost [2605:bc80:3010:600:dead:beef:cafe:feda]:443 + # proxy10 NameVirtualHost 10.5.126.51:80 NameVirtualHost 10.5.126.51:443 @@ -48,6 +58,21 @@ NameVirtualHost 67.219.144.68:443 NameVirtualHost [2604:1580:fe00:0:dead:beef:cafe:fed1]:80 NameVirtualHost [2604:1580:fe00:0:dead:beef:cafe:fed1]:443 +# proxy12 +NameVirtualHost 152.19.134.198:80 +NameVirtualHost 152.19.134.198:443 +NameVirtualHost [2610:28:3090:3001:5054:ff:feda:bbd8]:80 +NameVirtualHost [2610:28:3090:3001:5054:ff:feda:bbd8]:443 + +# proxy13 +NameVirtualHost 204.85.14.3:80 +NameVirtualHost 204.85.14.3:443 + +# proxy14 +NameVirtualHost 8.43.85.67:80 +NameVirtualHost 8.43.85.67:443 + + #proxy01.stg NameVirtualHost 10.5.126.88:80 NameVirtualHost 10.5.126.88:443 diff --git a/roles/mediawiki123/templates/LocalSettings.php.fp.j2 b/roles/mediawiki123/templates/LocalSettings.php.fp.j2 index c7f0adeeb8..073d2af800 100644 --- a/roles/mediawiki123/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki123/templates/LocalSettings.php.fp.j2 @@ -357,6 +357,10 @@ $wgSquidServersNoPurge = array( "140.211.169.196", "192.168.1.63", + # proxy07 + "174.141.234.172", + "192.168.1.52", + # proxy08 "67.203.2.67", "2607:f188::dead:beef:cafe:fed1",