Page MenuHomePhabricator
Create Task
Maniphest T104148

Change Squid references in Wikimedia configuration files
Closed, ResolvedPublic
Actions

Description

Configuration files currently use squid, but we should move to a more generic name to encompass Varnish and similar caching infrastructure.

#######################################################################
# Squid Configuration
#######################################################################

if ( $wmgUseClusterSquid ) {
    $wgUseSquid = true;
    $wgUseESI   = false;

    require( getRealmSpecificFilename( "$wmfConfigDir/squid.php" ) );
}

Files currently contains information about:

  • Multicast HTCP purging
  • the list of proxies allowed for X-Forwarded-For requests
  • $wgCdnReboundPurgeDelay - CDN purge configuration

Details

ProjectBranchLines +/-Subject
operations/mediawiki-configmaster+1 -15De-duplicate …Squid variables now MW only uses the …Cdn ones
mediawiki/coremaster+151 -80Rename CDN config variables to be generic, deprecating the old names
operations/mediawiki-configmaster+22 -5Duplicate …Squid variables into …Cdn ahead of MW renaming
operations/mediawiki-configmaster+3 -79Get rid of squid.php in favor of new reverse-proxy.php
operations/mediawiki-configmaster+1 -32Get rid of squid-file-labs in favor of new reverse-proxy-staging
operations/mediawiki-configmaster+208 -0copy squid.php->reverse-proxy.php, squid-labs->reverse-proxy-staging
operations/mediawiki-configmaster+11 -8Cleanup: squid.php → ReverseProxy.php
Customize query in gerrit

Related Objects
Search...

Event Timeline

Matanya created this task.Jun 28 2015, 10:12 PM
Matanya raised the priority of this task from to Needs Triage.
Matanya updated the task description. (Show Details)
Matanya added a project: Wikimedia-Site-requests.
Matanya added a subscriber: Matanya.
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptJun 28 2015, 10:12 PM
Matanya added a parent task: T31902: Tidy up wmf-config CommonSettings.php and InitialiseSettings.php.Jun 28 2015, 10:13 PM
hoo closed this task as Declined.Jun 28 2015, 10:14 PM
hoo claimed this task.
hoo added a subscriber: hoo.

We run varnish now and still need the XFF configuration.

Matanya added a comment.Jun 28 2015, 10:15 PM

So we should rename that to clarify this.

• MZMcBride renamed this task from Do we need Squid configuration? to Change Squid references in Wikimedia configuration files.Jun 29 2015, 3:03 AM
• MZMcBride reopened this task as Open.
• MZMcBride removed hoo as the assignee of this task.
• MZMcBride triaged this task as Lowest priority.
• MZMcBride set Security to None.
• MZMcBride added a subscriber: • MZMcBride.
• MZMcBride added a comment.Jun 29 2015, 3:07 AM
In T104148#1408662, @Matanya wrote:

So we should rename that to clarify this.

I agree. We should either change the name to be more accurate (e.g., $wmgUseClusterVarnish) or to be less precise (e.g., $wmgUseClusterCaching).

Reedy added a subscriber: Reedy.Jun 29 2015, 3:16 AM

I'm not sure I approve of renaming squid.php to cache.php (it's too vague; what sort of cache?), but there's certainly got to be a better name out there

Dereckson updated the task description. (Show Details)Sep 9 2016, 2:47 AM
Restricted Application added a subscriber: JEumerus. · View Herald TranscriptSep 9 2016, 2:47 AM
Dereckson added subscribers: aaron, Dereckson.EditedSep 9 2016, 2:47 AM

Perhaps ReverseProxy.php.

@aaron Would you have a suggestion for an ideal name?

Dereckson updated the task description. (Show Details)Sep 9 2016, 2:48 AM
Dereckson moved this task from Backlog to Analysis / under discussion on the Wikimedia-Site-requests board.
Dereckson added a comment.Sep 10 2016, 4:24 PM

I've prepared a patch with ReverseProxy.php.

CachingProxy.php could also be interesting.

gerritbot added a subscriber: gerritbot.Sep 10 2016, 4:25 PM

Change 309742 had a related patch set uploaded (by Dereckson):
Cleanup: squid.php → ReverseProxy.php

https://gerrit.wikimedia.org/r/309742

gerritbot added a project: Patch-For-Review.Sep 10 2016, 4:25 PM
Legoktm added a subscriber: Legoktm.Sep 10 2016, 6:03 PM

In MediaWiki core, Squid is slowly being renamed to Cdn. (e.g. rMW282c5fa9f31f: Rename SquidUpdate => CdnCacheUpdate, rMW6af3c39c0766: Replace "squid" with "CDN" in various comments, rMW4302b0419d96: Rename getSquidURLs() => getCdnUrls(), etc.)

Dereckson added a comment.Sep 10 2016, 6:13 PM

CdnCacheSettings.php?

TerraCodes added a subscriber: TerraCodes.Jul 16 2017, 1:31 PM
EddieGP added a subscriber: EddieGP.Aug 27 2017, 4:19 PM
gerritbot added a comment.Aug 28 2017, 4:53 PM

Change 309742 abandoned by Chad:
Cleanup: squid.php → ReverseProxy.php

Reason:
Abandoning all config changes > 1y old

https://gerrit.wikimedia.org/r/309742

Reedy removed a project: Patch-For-Review.Sep 6 2017, 7:13 PM
gerritbot added a comment.Sep 6 2017, 7:19 PM

Change 309742 restored by Dzahn:
Cleanup: squid.php → ReverseProxy.php

https://gerrit.wikimedia.org/r/309742

gerritbot added a comment.Sep 6 2017, 7:40 PM

Change 376337 had a related patch set uploaded (by Dzahn; owner: Dzahn):
[operations/mediawiki-config@master] copy squid.php->reverse-proxy.php, squid-labs->reverse-proxy-staging

https://gerrit.wikimedia.org/r/376337

gerritbot added a project: Patch-For-Review.Sep 6 2017, 7:40 PM
gerritbot added a comment.Sep 6 2017, 7:45 PM

Change 309742 abandoned by Dzahn:
Cleanup: squid.php → ReverseProxy.php

Reason:
sorry, trying it here instead now, pt.1 https://gerrit.wikimedia.org/r/#/c/376337/

https://gerrit.wikimedia.org/r/309742

EddieGP removed a subscriber: EddieGP.Sep 25 2017, 10:54 PM
Restricted Application added a subscriber: Jayprakash12345. · View Herald TranscriptSep 25 2017, 10:54 PM
gerritbot added a comment.Sep 28 2017, 6:19 PM

Change 376337 merged by jenkins-bot:
[operations/mediawiki-config@master] copy squid.php->reverse-proxy.php, squid-labs->reverse-proxy-staging

https://gerrit.wikimedia.org/r/376337

Stashbot added a subscriber: Stashbot.Sep 28 2017, 6:25 PM

Mentioned in SAL (#wikimedia-operations) [2017-09-28T18:25:22Z] <thcipriani@tin> Synchronized wmf-config: SWAT: [[gerrit:376337|copy squid.php->reverse-proxy.php, squid-labs->reverse-proxy-staging]] T104148 (duration: 00m 51s)

Stashbot added a comment.Sep 28 2017, 6:26 PM

Mentioned in SAL (#wikimedia-operations) [2017-09-28T18:26:52Z] <thcipriani@tin> Synchronized docroot/noc: SWAT: [[gerrit:376337|copy squid.php->reverse-proxy.php, squid-labs->reverse-proxy-staging]] PART II T104148 (duration: 00m 49s)

gerritbot added a comment.Oct 14 2017, 12:57 AM

Change 384193 had a related patch set uploaded (by Chad; owner: Chad):
[operations/mediawiki-config@master] Stop copy pasting squid/reverse proxy settings

https://gerrit.wikimedia.org/r/384193

gerritbot added a comment.Nov 1 2017, 4:49 PM

Change 384193 merged by jenkins-bot:
[operations/mediawiki-config@master] Get rid of squid-file-labs in favor of new reverse-proxy-staging

https://gerrit.wikimedia.org/r/384193

gerritbot added a comment.Nov 1 2017, 5:30 PM

Change 387832 had a related patch set uploaded (by Jforrester; owner: Jforrester):
[operations/mediawiki-config@master] Get rid of squid.php in favor of new reverse-proxy.php

https://gerrit.wikimedia.org/r/387832

Jdforrester-WMF added a subscriber: Jdforrester-WMF.Nov 1 2017, 5:36 PM

So do we also want to genericise the names of the config variables in MW itself?

  • $wgUseSquid -> $wgUseCdn
  • $wgSquidMaxage -> $wgCdnMaxAge
  • $wgSquidServers -> $wgCdnServers
  • $wgSquidServersNoPurge -> $wgCdnServersNoPurge
  • $wgSquidPurgeUseHostHeader -> $wgCdnPurgeUseHostHeader

(We already have $wgCdnMaxageLagged, $wgCdnReboundPurgeDelay, $wgCdnReboundPurgeDelay, …)

gerritbot added a comment.Nov 1 2017, 6:25 PM

Change 387832 merged by jenkins-bot:
[operations/mediawiki-config@master] Get rid of squid.php in favor of new reverse-proxy.php

https://gerrit.wikimedia.org/r/387832

gerritbot added a comment.Nov 1 2017, 8:56 PM

Change 387877 had a related patch set uploaded (by Jforrester; owner: Jforrester):
[mediawiki/core@master] [WIP] Rename CDN config variables to be generic, deprecating the old names

https://gerrit.wikimedia.org/r/387877

Reedy added a comment.Nov 1 2017, 10:52 PM
In T104148#3727257, @Jdforrester-WMF wrote:

So do we also want to genericise the names of the config variables in MW itself?

Thanks for doing a patch. Of course, cleaning things up whilst we go through/can always makes sense. Otherwise it's another blocker/hurdle to removing them once deprecated from MW core. If they're already gone from mw-config, that's one less thing we need to fix later

gerritbot added a comment.Mar 15 2019, 6:27 PM

Change 496847 had a related patch set uploaded (by Jforrester; owner: Jforrester):
[operations/mediawiki-config@master] Duplicate …Squid variables into …Cdn ahead of MW renaming

https://gerrit.wikimedia.org/r/496847

gerritbot added a comment.Mar 15 2019, 6:27 PM

Change 496850 had a related patch set uploaded (by Jforrester; owner: Jforrester):
[operations/mediawiki-config@master] De-dplicate …Squid variables now MW only uses the …Cdn ones

https://gerrit.wikimedia.org/r/496850

gerritbot added a comment.Mar 19 2019, 8:56 PM

Change 387877 had a related patch set uploaded (by Jforrester; owner: Jforrester):
[mediawiki/core@master] Rename CDN config variables to be generic, deprecating the old names

https://gerrit.wikimedia.org/r/387877

gerritbot added a comment.May 8 2019, 10:57 PM

Change 496850 had a related patch set uploaded (by Jforrester; owner: Jforrester):
[operations/mediawiki-config@master] De-duplicate …Squid variables now MW only uses the …Cdn ones

https://gerrit.wikimedia.org/r/496850

gerritbot added a comment.May 9 2019, 6:04 PM

Change 496847 had a related patch set uploaded (by Jforrester; owner: Jforrester):
[operations/mediawiki-config@master] Duplicate …Squid variables into …Cdn ahead of MW renaming

https://gerrit.wikimedia.org/r/496847

gerritbot added a comment.May 23 2019, 10:21 PM

Change 496847 merged by jenkins-bot:
[operations/mediawiki-config@master] Duplicate …Squid variables into …Cdn ahead of MW renaming

https://gerrit.wikimedia.org/r/496847

Stashbot added a comment.May 23 2019, 10:23 PM

Mentioned in SAL (#wikimedia-operations) [2019-05-23T22:23:28Z] <jforrester@deploy1001> Synchronized wmf-config/reverse-proxy.php: T104148 Duplicate …Squid variables into …Cdn ahead of MW renaming, part 1 (duration: 00m 48s)

Stashbot added a comment.May 23 2019, 10:24 PM

Mentioned in SAL (#wikimedia-operations) [2019-05-23T22:24:36Z] <jforrester@deploy1001> Synchronized wmf-config/InitialiseSettings.php: T104148 Duplicate …Squid variables into …Cdn ahead of MW renaming, part 2 (duration: 00m 48s)

Stashbot added a comment.May 23 2019, 10:25 PM

Mentioned in SAL (#wikimedia-operations) [2019-05-23T22:25:44Z] <jforrester@deploy1001> Synchronized wmf-config/CommonSettings.php: T104148 Duplicate …Squid variables into …Cdn ahead of MW renaming, part 3 (duration: 00m 47s)

gerritbot added a comment.May 24 2019, 9:39 PM

Change 387877 merged by jenkins-bot:
[mediawiki/core@master] Rename CDN config variables to be generic, deprecating the old names

https://gerrit.wikimedia.org/r/387877

ReleaseTaggerBot added a project: MW-1.34-notes (1.34.0-wmf.7; 2019-05-28).May 25 2019, 4:01 AM
gerritbot added a comment.Jun 6 2019, 8:50 PM

Change 496850 merged by jenkins-bot:
[operations/mediawiki-config@master] De-duplicate …Squid variables now MW only uses the …Cdn ones

https://gerrit.wikimedia.org/r/496850

Jdforrester-WMF closed this task as Resolved.Jun 6 2019, 9:07 PM
Jdforrester-WMF claimed this task.
Jdforrester-WMF edited projects, added Release-Engineering-Team (Kanban); removed Patch-For-Review.
Jdforrester-WMF moved this task from Backlog to Done (within RelEng) on the Release-Engineering-Team (Kanban) board.
Content licensed under Creative Commons Attribution-ShareAlike 3.0 (CC-BY-SA) unless otherwise noted; code licensed under GNU General Public License (GPL) or other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL