BBlack has submitted this change and it was merged.
Change subject: wgCanonicalServer: HTTPS for all
......................................................................
wgCanonicalServer: HTTPS for all
Also, reverts specific wiki entries that were only specified for
HTTPS reasons in the past (ca, el, en, he, it, ru, zh, ug, uz).
This reverts commit 8f99d5f4a5009b4a3e82e80c638ae073224c4b99.
This reverts commit 471b5985e11d58d517874225a623ffd4c323cfd0.
This reverts commit 8c0e3d73868f86e5a40f0cb1441bd210ef048ed6.
This reverts commit b582d2cc1d597c2a645365ccf0b44e75f0e61d66.
Change-Id: Ia7c09fd8f0544353ca17c7ae54084c9d69efbb6c
---
M wmf-config/InitialiseSettings.php
1 file changed, 44 insertions(+), 103 deletions(-)
Approvals:
BBlack: Looks good to me, approved
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index a4c3fd5..2d04924 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -1379,143 +1379,84 @@
# wgCanonicalServer @{
'wgCanonicalServer' => array(
// Projects
- 'default' => 'http://$lang.wikipedia.org',
- 'wikibooks' => 'http://$lang.wikibooks.org',
- 'wikimedia' => 'http://$lang.wikimedia.org',
- 'wikinews' => 'http://$lang.wikinews.org',
- 'wikiquote' => 'http://$lang.wikiquote.org',
- 'wikisource' => 'http://$lang.wikisource.org',
- 'wikiversity' => 'http://$lang.wikiversity.org',
- 'wikivoyage' => 'http://$lang.wikivoyage.org',
- 'wiktionary' => 'http://$lang.wiktionary.org',
+ 'default' => 'https://$lang.wikipedia.org',
+ 'wikibooks' => 'https://$lang.wikibooks.org',
+ 'wikimedia' => 'https://$lang.wikimedia.org',
+ 'wikinews' => 'https://$lang.wikinews.org',
+ 'wikiquote' => 'https://$lang.wikiquote.org',
+ 'wikisource' => 'https://$lang.wikisource.org',
+ 'wikiversity' => 'https://$lang.wikiversity.org',
+ 'wikivoyage' => 'https://$lang.wikivoyage.org',
+ 'wiktionary' => 'https://$lang.wiktionary.org',
// Individual wikis
- 'advisorywiki' => 'http://advisory.wikimedia.org',
+ 'advisorywiki' => 'https://advisory.wikimedia.org',
'arbcom_dewiki' => 'https://arbcom-de.wikipedia.org',
'arbcom_enwiki' => 'https://arbcom-en.wikipedia.org',
'arbcom_fiwiki' => 'https://arbcom-fi.wikipedia.org',
'arbcom_nlwiki' => 'https://arbcom-nl.wikipedia.org',
- 'arwikimedia' => 'http://ar.wikimedia.org',
+ 'arwikimedia' => 'https://ar.wikimedia.org',
'auditcomwiki' => 'https://auditcom.wikimedia.org',
'boardgovcomwiki' => 'https://boardgovcom.wikimedia.org',
'boardwiki' => 'https://board.wikimedia.org',
- 'brwikimedia' => 'http://br.wikimedia.org',
- 'cawiki' => 'https://ca.wikipedia.org',
- 'cawikibooks' => 'https://ca.wikibooks.org',
- 'cawikimedia' => 'https://ca.wikimedia.org',
- 'cawikinews' => 'https://ca.wikinews.org',
- 'cawikiquote' => 'https://ca.wikiquote.org',
- 'cawikisource' => 'https://ca.wikisource.org',
- 'cawiktionary' => 'https://ca.wiktionary.org',
+ 'brwikimedia' => 'https://br.wikimedia.org',
'chairwiki' => 'https://chair.wikimedia.org',
'chapcomwiki' => 'https://chapcom.wikimedia.org',
'checkuserwiki' => 'https://checkuser.wikimedia.org',
'cnwikimedia' => 'https://cn.wikimedia.org', // T98676
'collabwiki' => 'https://collab.wikimedia.org',
- 'commonswiki' => 'http://commons.wikimedia.org',
+ 'commonswiki' => 'https://commons.wikimedia.org',
'donatewiki' => 'https://donate.wikimedia.org',
- 'elwiki' => 'https://el.wikipedia.org',
- 'elwikibooks' => 'https://el.wikibooks.org',
- 'elwikinews' => 'https://el.wikinews.org',
- 'elwikiquote' => 'https://el.wikiquote.org',
- 'elwikisource' => 'https://el.wikisource.org',
- 'elwikiversity' => 'https://el.wikiversity.org',
- 'elwikivoyage' => 'https://el.wikivoyage.org',
- 'elwiktionary' => 'https://el.wiktionary.org',
- 'enwiki' => 'https://en.wikipedia.org',
- 'enwikibooks' => 'https://en.wikibooks.org',
- 'enwikinews' => 'https://en.wikinews.org',
- 'enwikiquote' => 'https://en.wikiquote.org',
- 'enwikisource' => 'https://en.wikisource.org',
- 'enwikiversity' => 'https://en.wikiversity.org',
- 'enwikivoyage' => 'https://en.wikivoyage.org',
- 'enwiktionary' => 'https://en.wiktionary.org',
'execwiki' => 'https://exec.wikimedia.org',
'fdcwiki' => 'https://fdc.wikimedia.org',
- 'foundationwiki' => 'http://wikimediafoundation.org',
+ 'foundationwiki' => 'https://wikimediafoundation.org',
'grantswiki' => 'https://grants.wikimedia.org',
- 'hewiki' => 'https://he.wikipedia.org',
- 'hewikibooks' => 'https://he.wikibooks.org',
- 'hewikinews' => 'https://he.wikinews.org',
- 'hewikiquote' => 'https://he.wikiquote.org',
- 'hewikisource' => 'https://he.wikisource.org',
- 'hewikivoyage' => 'https://he.wikivoyage.org',
- 'hewiktionary' => 'https://he.wiktionary.org',
'iegcomwiki' => 'https://iegcom.wikimedia.org',
- 'incubatorwiki' => 'http://incubator.wikimedia.org',
+ 'incubatorwiki' => 'https://incubator.wikimedia.org',
'internalwiki' => 'https://internal.wikimedia.org',
- 'itwiki' => 'https://it.wikipedia.org',
- 'itwikibooks' => 'https://it.wikibooks.org',
- 'itwikinews' => 'https://it.wikinews.org',
- 'itwikiquote' => 'https://it.wikiquote.org',
- 'itwikisource' => 'https://it.wikisource.org',
- 'itwikiversity' => 'https://it.wikiversity.org',
- 'itwikivoyage' => 'https://it.wikivoyage.org',
- 'itwiktionary' => 'https://it.wiktionary.org',
'labswiki' => 'https://wikitech.wikimedia.org',
'legalteamwiki' => 'https://legalteam.wikimedia.org',
- 'loginwiki' => 'http://login.wikimedia.org',
- 'mediawikiwiki' => 'http://www.mediawiki.org',
- 'metawiki' => 'http://meta.wikimedia.org',
+ 'loginwiki' => 'https://login.wikimedia.org',
+ 'mediawikiwiki' => 'https://www.mediawiki.org',
+ 'metawiki' => 'https://meta.wikimedia.org',
'movementroleswiki' => 'https://movementroles.wikimedia.org',
- 'mxwikimedia' => 'http://mx.wikimedia.org',
- 'noboard_chapterswikimedia' => 'http://noboard-chapters.wikimedia.org',
- 'nycwikimedia' => 'http://nyc.wikimedia.org', // Bug T31273
+ 'mxwikimedia' => 'https://mx.wikimedia.org',
+ 'noboard_chapterswikimedia' => 'https://noboard-chapters.wikimedia.org',
+ 'nycwikimedia' => 'https://nyc.wikimedia.org', // Bug T31273
'officewiki' => 'https://office.wikimedia.org',
'ombudsmenwiki' => 'https://ombudsmen.wikimedia.org',
'otrs_wikiwiki' => 'https://otrs-wiki.wikimedia.org',
- 'outreachwiki' => 'http://outreach.wikimedia.org',
- 'pa_uswikimedia' => 'http://pa-us.wikimedia.org',
- 'qualitywiki' => 'http://quality.wikimedia.org',
- 'ruwiki' => 'https://ru.wikipedia.org',
- 'ruwikibooks' => 'https://ru.wikibooks.org',
- 'ruwikimedia' => 'https://ru.wikimedia.org',
- 'ruwikinews' => 'https://ru.wikinews.org',
- 'ruwikiquote' => 'https://ru.wikiquote.org',
- 'ruwikisource' => 'https://ru.wikisource.org',
- 'ruwikiversity' => 'https://ru.wikiversity.org',
- 'ruwikivoyage' => 'https://ru.wikivoyage.org',
- 'ruwiktionary' => 'https://ru.wiktionary.org',
+ 'outreachwiki' => 'https://outreach.wikimedia.org',
+ 'pa_uswikimedia' => 'https://pa-us.wikimedia.org',
+ 'qualitywiki' => 'https://quality.wikimedia.org',
'searchcomwiki' => 'https://searchcom.wikimedia.org',
- 'sourceswiki' => 'http://wikisource.org',
+ 'sourceswiki' => 'https://wikisource.org',
'spcomwiki' => 'https://spcom.wikimedia.org',
- 'specieswiki' => 'http://species.wikimedia.org',
+ 'specieswiki' => 'https://species.wikimedia.org',
'stewardwiki' => 'https://steward.wikimedia.org',
- 'strategywiki' => 'http://strategy.wikimedia.org',
- 'tenwiki' => 'http://ten.wikipedia.org',
- 'testwiki' => 'http://test.wikipedia.org',
- 'testwikidatawiki' => 'http://test.wikidata.org',
+ 'strategywiki' => 'https://strategy.wikimedia.org',
+ 'tenwiki' => 'https://ten.wikipedia.org',
+ 'testwiki' => 'https://test.wikipedia.org',
+ 'testwikidatawiki' => 'https://test.wikidata.org',
'transitionteamwiki' => 'https://transitionteam.wikimedia.org',
- 'usabilitywiki' => 'http://usability.wikimedia.org',
- 'ugwiki' => 'https://ug.wikipedia.org',
- 'ugwikibooks' => 'https://ug.wikibooks.org',
- 'ugwikiquote' => 'https://ug.wikiquote.org',
- 'ugwiktionary' => 'https://ug.wiktionary.org',
- 'uzwiki' => 'https://uz.wikipedia.org', // Bug T45466
+ 'usabilitywiki' => 'https://usability.wikimedia.org',
'votewiki' => 'https://vote.wikimedia.org',
'wg_enwiki' => 'https://wg-en.wikipedia.org',
- 'wikidatawiki' => 'http://www.wikidata.org',
- 'wikimania2005wiki' => 'http://wikimania2005.wikimedia.org',
- 'wikimania2006wiki' => 'http://wikimania2006.wikimedia.org',
- 'wikimania2007wiki' => 'http://wikimania2007.wikimedia.org',
- 'wikimania2008wiki' => 'http://wikimania2008.wikimedia.org',
- 'wikimania2009wiki' => 'http://wikimania2009.wikimedia.org',
- 'wikimania2010wiki' => 'http://wikimania2010.wikimedia.org',
- 'wikimania2011wiki' => 'http://wikimania2011.wikimedia.org',
- 'wikimania2012wiki' => 'http://wikimania2012.wikimedia.org',
- 'wikimania2013wiki' => 'http://wikimania2013.wikimedia.org',
- 'wikimania2014wiki' => 'http://wikimania2014.wikimedia.org',
- 'wikimania2015wiki' => 'http://wikimania2015.wikimedia.org',
- 'wikimania2016wiki' => 'http://wikimania2016.wikimedia.org',
+ 'wikidatawiki' => 'https://www.wikidata.org',
+ 'wikimania2005wiki' => 'https://wikimania2005.wikimedia.org',
+ 'wikimania2006wiki' => 'https://wikimania2006.wikimedia.org',
+ 'wikimania2007wiki' => 'https://wikimania2007.wikimedia.org',
+ 'wikimania2008wiki' => 'https://wikimania2008.wikimedia.org',
+ 'wikimania2009wiki' => 'https://wikimania2009.wikimedia.org',
+ 'wikimania2010wiki' => 'https://wikimania2010.wikimedia.org',
+ 'wikimania2011wiki' => 'https://wikimania2011.wikimedia.org',
+ 'wikimania2012wiki' => 'https://wikimania2012.wikimedia.org',
+ 'wikimania2013wiki' => 'https://wikimania2013.wikimedia.org',
+ 'wikimania2014wiki' => 'https://wikimania2014.wikimedia.org',
+ 'wikimania2015wiki' => 'https://wikimania2015.wikimedia.org',
+ 'wikimania2016wiki' => 'https://wikimania2016.wikimedia.org',
'wikimaniateamwiki' => 'https://wikimaniateam.wikimedia.org',
'zerowiki' => 'https://zero.wikimedia.org',
- 'zhwiki' => 'https://zh.wikipedia.org',
- 'zhwikibooks' => 'https://zh.wikibooks.org',
- 'zhwikinews' => 'https://zh.wikinews.org',
- 'zhwikiquote' => 'https://zh.wikiquote.org',
- 'zhwikisource' => 'https://zh.wikisource.org',
- 'zhwikivoyage' => 'https://zh.wikivoyage.org',
- 'zhwiktionary' => 'https://zh.wiktionary.org',
),
# @} end of wgCanonicalServer
--
To view, visit https://gerrit.wikimedia.org/r/218648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7c09fd8f0544353ca17c7ae54084c9d69efbb6c
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
