diff --git a/inventory/cloud b/inventory/cloud index bc1b8c930b..118888a349 100644 --- a/inventory/cloud +++ b/inventory/cloud @@ -22,6 +22,7 @@ iddev.fedorainfracloud.org rawhide-test.fedorainfracloud.org testdays.fedorainfracloud.org proxy30.fedoraproject.org +proxy31.fedoraproject.org copr-be.aws.fedoraproject.org copr-be-dev.aws.fedoraproject.org copr-dist-git.aws.fedoraproject.org diff --git a/inventory/inventory b/inventory/inventory index dc10e0e788..12fa52a3dd 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -399,6 +399,7 @@ proxy12.fedoraproject.org proxy13.fedoraproject.org proxy14.fedoraproject.org proxy30.fedoraproject.org +proxy31.fedoraproject.org proxy101.phx2.fedoraproject.org proxy110.phx2.fedoraproject.org @@ -570,6 +571,7 @@ proxy12.fedoraproject.org proxy13.fedoraproject.org proxy14.fedoraproject.org proxy30.fedoraproject.org +proxy31.fedoraproject.org [proxies_internal] proxy101.phx2.fedoraproject.org diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index 6818a6a1d4..5a304db040 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -42,6 +42,7 @@ syncHttpLogs proxy12.vpn.fedoraproject.org syncHttpLogs proxy13.vpn.fedoraproject.org syncHttpLogs proxy14.vpn.fedoraproject.org syncHttpLogs proxy30.vpn.fedoraproject.org +syncHttpLogs proxy31.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 9ccef0d31f..1bffa387ad 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 proxy30.vpn.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 proxy31.vpn.fedoraproject.org diff --git a/roles/httpd/proxy/templates/00-namevirtualhost.conf b/roles/httpd/proxy/templates/00-namevirtualhost.conf index f71710227f..50e2139c51 100644 --- a/roles/httpd/proxy/templates/00-namevirtualhost.conf +++ b/roles/httpd/proxy/templates/00-namevirtualhost.conf @@ -86,3 +86,9 @@ 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 + +# proxy31 +NameVirtualHost 13.125.120.8:80 +NameVirtualHost 13.125.120.8:443 +NameVirtualHost [2406:da12:0:c10:92a3:5a6e:221b:f9eb]:80 +NameVirtualHost [2406:da12:0:c10:92a3:5a6e:221b:f9eb]:443 diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2 index 5380ff6347..a431fc478a 100644 --- a/roles/mediawiki/templates/LocalSettings.php.fp.j2 +++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2 @@ -389,6 +389,11 @@ $wgSquidServersNoPurge = array( "192.168.1.190", "2406:da18:39f:a01:a89d:5e25:1aab:8a52", + # proxy31 + "13.125.120.8", + "192.168.1.191", + "2406:da12:0:c10:92a3:5a6e:221b:f9eb", + {% endif %} ); # This setting is used to send PURGE requests to varnish on reverse proxies upon page changes