jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/389779 )
Change subject: Fix reverse-proxy symlinks ...................................................................... Fix reverse-proxy symlinks You know, so they're actual symlinks Change-Id: I2e51e783abc4af9133a929082abdfe6b2d07c9fd --- D docroot/noc/conf/reverse-proxy-staging.php.txt A docroot/noc/conf/reverse-proxy-staging.php.txt D docroot/noc/conf/reverse-proxy.php.txt A docroot/noc/conf/reverse-proxy.php.txt 4 files changed, 2 insertions(+), 103 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified Zoranzoki21: Looks good to me, but someone else must approve diff --git a/docroot/noc/conf/reverse-proxy-staging.php.txt b/docroot/noc/conf/reverse-proxy-staging.php.txt deleted file mode 100644 index 06d8480..0000000 --- a/docroot/noc/conf/reverse-proxy-staging.php.txt +++ /dev/null @@ -1,29 +0,0 @@ -<?php -# our text squid in beta labs gets forwarded requests -# from the ssl terminator, to 127.0.0.1, so adding that -# address to the NoPurge list so that XFF headers for it -# will be stripped; purge requests should get to it -# on the address in the SquidServers list - -# The beta cluster does not have multicast, hence we route the purge -# requests directly to the varnish instances. They have varnishhtcpd listening -# on UDP port 4827. - -$wgSquidServersNoPurge = [ '127.0.0.1', - '10.68.18.103', # deployment-cache-text04 - '10.68.18.109', # deployment-cache-upload04 -]; -$wgHTCPRouting = [ - '|^https?://upload\.beta\.wmflabs\.org|' => [ - 'host' => '10.68.18.109', # deployment-cache-upload04 - 'port' => 4827, - ], - - # Fallback (text) - '' => [ - [ - 'host' => '10.68.18.103', # deployment-cache-text04 - 'port' => 4827, - ], - ], -]; diff --git a/docroot/noc/conf/reverse-proxy-staging.php.txt b/docroot/noc/conf/reverse-proxy-staging.php.txt new file mode 120000 index 0000000..d367756 --- /dev/null +++ b/docroot/noc/conf/reverse-proxy-staging.php.txt @@ -0,0 +1 @@ +../../../wmf-config/reverse-proxy-staging.php \ No newline at end of file diff --git a/docroot/noc/conf/reverse-proxy.php.txt b/docroot/noc/conf/reverse-proxy.php.txt deleted file mode 100644 index af7033a..0000000 --- a/docroot/noc/conf/reverse-proxy.php.txt +++ /dev/null @@ -1,74 +0,0 @@ -<?php -# HTCP multicast squid purging -$wgHTCPRouting = [ - '' => [ - 'host' => '239.128.0.112', - 'port' => 4827 - ] -]; -$wgHTCPMulticastTTL = 8; - -# Accept XFF from these proxies -$wgSquidServersNoPurge = [ - # Note: the general idea here is to cover infrastructure space - # where e.g. Varnish and SSL servers could be located, but exclude - # other misc subnets (e.g. labs, analytics). - - ## eqiad - '208.80.154.0/26', # public1-a-eqiad - '2620:0:861:1::/64', # public1-a-eqiad - '208.80.154.128/26', # public1-b-eqiad - '2620:0:861:2::/64', # public1-b-eqiad - '208.80.154.64/26', # public1-c-eqiad - '2620:0:861:3::/64', # public1-c-eqiad - '208.80.155.96/27', # public1-d-eqiad - '2620:0:861:4::/64', # public1-d-eqiad - '10.64.0.0/22', # private1-a-eqiad - '2620:0:861:101::/64', # private1-a-eqiad - '10.64.16.0/22', # private1-b-eqiad - '2620:0:861:102::/64', # private1-b-eqiad - '10.64.32.0/22', # private1-c-eqiad - '2620:0:861:103::/64', # private1-c-eqiad - '10.64.48.0/22', # private1-d-eqiad - '2620:0:861:107::/64', # private1-d-eqiad - - ## codfw - '208.80.153.0/27', # public1-a-codfw - '2620:0:860:1::/64', # public1-a-codfw - '208.80.153.32/27', # public1-b-codfw - '2620:0:860:2::/64', # public1-b-codfw - '208.80.153.64/27', # public1-c-codfw - '2620:0:860:3::/64', # public1-c-codfw - '208.80.153.96/27', # public1-d-codfw - '2620:0:860:4::/64', # public1-d-codfw - '10.192.0.0/22', # private1-a-codfw - '2620:0:860:101::/64', # private1-a-codfw - '10.192.16.0/22', # private1-b-codfw - '2620:0:860:102::/64', # private1-b-codfw - '10.192.32.0/22', # private1-c-codfw - '2620:0:860:103::/64', # private1-c-codfw - '10.192.48.0/22', # private1-d-codfw - '2620:0:860:104::/64', # private1-d-codfw - - ## esams - '91.198.174.0/25', # public1-esams - '2620:0:862:1::/64', # public1-esams - '10.20.0.0/24', # private1-esams - '2620:0:862:102::/64', # private1-esams - - ## ulsfo - '10.128.0.0/24', # private1-ulsfo - '2620:0:863:101::/64', # private1-ulsfo - '10.2.4.26', # mobile.svc.ulsfo.wmnet, appears in XFF -]; - -# IP addresses that aren't proxies, regardless of what the other sources might say -$wgProxyWhitelist = [ - '68.124.59.186', - '202.63.61.242', - '62.214.230.86', - '217.94.171.96', -]; - -# Secondary purges to deal with DB replication lag -$wgCdnReboundPurgeDelay = 11; // should be safely more than $wgLBFactoryConf 'max lag' diff --git a/docroot/noc/conf/reverse-proxy.php.txt b/docroot/noc/conf/reverse-proxy.php.txt new file mode 120000 index 0000000..541a483 --- /dev/null +++ b/docroot/noc/conf/reverse-proxy.php.txt @@ -0,0 +1 @@ +../../../wmf-config/reverse-proxy.php \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/389779 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e51e783abc4af9133a929082abdfe6b2d07c9fd Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Chad <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: Urbanecm <[email protected]> Gerrit-Reviewer: Zoranzoki21 <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
