infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

add proxy30 to config files

Browse source
This commit is contained in:
Stephen Smoogen 2020-02-04 19:38:13 +00:00 • committed by Pierre-Yves Chibon
parent c6211bbb8e
commit 9d02ba6cf4
5 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
roles/base/files/syncHttpLogs.sh
View file

@ -41,6 +41,7 @@ syncHttpLogs proxy11.vpn.fedoraproject.org
syncHttpLogs proxy12.vpn.fedoraproject.org syncHttpLogs proxy12.vpn.fedoraproject.org
syncHttpLogs proxy13.vpn.fedoraproject.org syncHttpLogs proxy13.vpn.fedoraproject.org
syncHttpLogs proxy14.vpn.fedoraproject.org syncHttpLogs proxy14.vpn.fedoraproject.org
syncHttpLogs proxy30.vpn.fedoraproject.org
syncHttpLogs proxy101.phx2.fedoraproject.org syncHttpLogs proxy101.phx2.fedoraproject.org
syncHttpLogs proxy110.phx2.fedoraproject.org syncHttpLogs proxy110.phx2.fedoraproject.org
syncHttpLogs proxy01.stg.phx2.fedoraproject.org syncHttpLogs proxy01.stg.phx2.fedoraproject.org

2
roles/epylog/files/merged/modules.d/rsyncd.conf
View file

@ -12,5 +12,5 @@ priority = 7
# Report this many "top ranking hosts" # Report this many "top ranking hosts"
# #
report_top = 10 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

2
roles/hosts/files/staging-hosts
View file

@ -1,7 +1,7 @@
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 ::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.126.23 infrastructure.fedoraproject.org
10.5.128.175 pkgs.fedoraproject.org 10.5.128.175 pkgs.fedoraproject.org
10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 10.5.128.148 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04

6
roles/httpd/proxy/templates/00-namevirtualhost.conf
View file

@ -80,3 +80,9 @@ NameVirtualHost [2620:52:3:1:dead:beef:cafe:fed7]:443
#proxy01.stg #proxy01.stg
NameVirtualHost 10.5.128.177:80 NameVirtualHost 10.5.128.177:80
NameVirtualHost 10.5.128.177:443 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

5
roles/mediawiki/templates/LocalSettings.php.fp.j2
View file

@ -384,6 +384,11 @@ $wgSquidServersNoPurge = array(
"2620:52:3:1:dead:beef:cafe:fed7", "2620:52:3:1:dead:beef:cafe:fed7",
"192.168.1.159", "192.168.1.159",
# proxy30
"13.250.126.156",
"192.168.1.190",
"2406:da18:39f:a01:a89d:5e25:1aab:8a52",
{% endif %} {% endif %}
); );
# This setting is used to send PURGE requests to varnish on reverse proxies upon page changes # This setting is used to send PURGE requests to varnish on reverse proxies upon page changes