diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index 35c7e7bdbc..6818a6a1d4 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -41,6 +41,7 @@ syncHttpLogs proxy11.vpn.fedoraproject.org syncHttpLogs proxy12.vpn.fedoraproject.org syncHttpLogs proxy13.vpn.fedoraproject.org syncHttpLogs proxy14.vpn.fedoraproject.org +syncHttpLogs proxy30.vpn.fedoraproject.org syncHttpLogs proxy101.phx2.fedoraproject.org syncHttpLogs proxy110.phx2.fedoraproject.org syncHttpLogs proxy01.stg.phx2.fedoraproject.org diff --git a/roles/epylog/files/merged/modules.d/rsyncd.conf b/roles/epylog/files/merged/modules.d/rsyncd.conf index b90821a886..9ccef0d31f 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 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 +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 proxy30.vpn.fedoraproject.org diff --git a/roles/hosts/files/staging-hosts b/roles/hosts/files/staging-hosts index 5b527344bc..403f9b2df6 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.128.177 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.128.177 proxy01.phx2.fedoraproject.org proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 proxy12 proxy13 proxy14 proxy30 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.128.175 pkgs.fedoraproject.org 10.5.128.148 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 836bf305e0..f71710227f 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -80,3 +80,9 @@ NameVirtualHost [2620:52:3:1:dead:beef:cafe:fed7]:443 #proxy01.stg NameVirtualHost 10.5.128.177:80 NameVirtualHost 10.5.128.177:443 + +# proxy30 +NameVirtualHost 13.250.126.156:80 +NameVirtualHost 13.250.126.156:443 +NameVirtualHost [2406:da18:39f:a01:a89d:5e25:1aab:8a52]:80 +NameVirtualHost [2406:da18:39f:a01:a89d:5e25:1aab:8a52]:443 diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index 87d3997f78..5380ff6347 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -384,6 +384,11 @@ $wgSquidServersNoPurge = array( "2620:52:3:1:dead:beef:cafe:fed7", "192.168.1.159", + # proxy30 + "13.250.126.156", + "192.168.1.190", + "2406:da18:39f:a01:a89d:5e25:1aab:8a52", + {% endif %} ); # This setting is used to send PURGE requests to varnish on reverse proxies upon page changes