jenkins-bot has submitted this change and it was merged. Change subject: wgRC2UDPPrefix: Use hostname-".org" instead of lang.site ......................................................................
wgRC2UDPPrefix: Use hostname-".org" instead of lang.site This fixes inconsistently named IRC recent changes channels that are caused by assuming 'wiki' databases use 'wikipedia.org' as hostname (where in fact many have dedicates domains or use subdomains under wikimedia.org instead of wikipeida.org). I ran a script to extract the current value for $wgRC2UDPPrefix from each wiki and insert into InitialiseSettings if it is different than hostname-.org. So this commit should have no effective change, it merely changes the default for new wikis from now on. So that instead of overriding to fix it, it overrides only to use the legacy naming. In the future we can easily migrate from the legacy name to the proper name (bug 28276) by removing the override from this array. Change-Id: I249fa712aed7d8b180ec9508f6804df7c624c77a --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 2 files changed, 49 insertions(+), 14 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 0f38711..d156749 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2720,6 +2720,14 @@ // https://bugzilla.wikimedia.org/show_bug.cgi?id=37211 $wgUseCombinedLoginLink = false; +if ( $wgRC2UDPPrefix === false ) { + $matches = null; + preg_match( '/^\/\/(.+).org$/', $wgServer, $matches ); + if ( isset( $matches[1] ) ) { + $wgRC2UDPPrefix = "#{$matches[1]}\t"; + } +} + // Confirmed can do anything autoconfirmed can. $wgGroupPermissions['confirmed'] = $wgGroupPermissions['autoconfirmed']; $wgGroupPermissions['confirmed']['skipcaptcha'] = true; diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ff5f11e..24b0ecb 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -6262,22 +6262,49 @@ ), 'wgRC2UDPPrefix' => array( - 'default' => "#\$lang.\$site\t", - 'donatewiki' => "#donate.wikimedia.org\t", + 'default' => false, + 'advisorywiki' => "#advisory.wikipedia\t", + 'arbcom_dewiki' => "#arbcom-de.wikipedia\t", + 'arbcom_enwiki' => "#arbcom-en.wikipedia\t", + 'arbcom_fiwiki' => "#arbcom-fi.wikipedia\t", + 'arbcom_nlwiki' => "#arbcom-nl.wikipedia\t", + 'auditcomwiki' => "#auditcom.wikipedia\t", + 'boardgovcomwiki' => "#boardgovcom.wikipedia\t", + 'boardwiki' => "#board.wikipedia\t", + 'chairwiki' => "#chair.wikipedia\t", + 'chapcomwiki' => "#chapcom.wikipedia\t", + 'checkuserwiki' => "#checkuser.wikipedia\t", + 'collabwiki' => "#collab.wikipedia\t", + 'donatewiki' => "#donate.wikimedia.org\t", + 'execwiki' => "#exec.wikipedia\t", + 'fdcwiki' => "#fdc.wikipedia\t", 'foundationwiki' => "#wikimediafoundation.org\t", - 'metawiki' => "#meta.wikimedia\t", - 'sourceswiki' => "#wikisource\t", - 'commonswiki' => "#commons.wikimedia\t", - 'grantswiki' => "#grants.wikimedia\t", - 'specieswiki' => "#species.wikimedia\t", - 'strategywiki' => "#strategy.wikimedia\t", + 'iegcomwiki' => "#iegcom.wikipedia\t", + 'internalwiki' => "#internal.wikipedia\t", + 'loginwiki' => "#login.wikipedia\t", + 'mediawikiwiki' => "#mediawiki.wikipedia\t", + 'movementroleswiki' => "#movementroles.wikipedia\t", + 'noboard_chapterswikimedia' => "#noboard-chapters.wikimedia\t", + 'officewiki' => "#office.wikipedia\t", + 'ombudsmenwiki' => "#ombudsmen.wikipedia\t", + 'otrs_wikiwiki' => "#otrs-wiki.wikipedia\t", + 'outreachwiki' => "#outreach.wikipedia\t", + 'qualitywiki' => "#quality.wikipedia\t", + 'searchcomwiki' => "#searchcom.wikipedia\t", + 'spcomwiki' => "#spcom.wikipedia\t", + 'stewardwiki' => "#steward.wikipedia\t", + 'testwikidatawiki' => "#testwikidata.wikipedia\t", + 'transitionteamwiki' => "#transitionteam.wikipedia\t", + 'votewiki' => "#vote.wikipedia\t", + 'wg_enwiki' => "#wg-en.wikipedia\t", + 'wikidatawiki' => "#wikidata.wikipedia\t", 'wikimania2005wiki' => "#wikimania.wikimedia\t", - 'wikimania2006wiki' => "#wikimania2006.wikimedia\t", - 'wikimania2007wiki' => "#wikimania2007.wikimedia\t", - 'wikimania2008wiki' => "#wikimania2008.wikimedia\t", - 'wikimania2009wiki' => "#wikimania2009.wikimedia\t", - 'incubatorwiki' => "#incubator.wikimedia\t", - 'usabilitywiki' => "#usability.wikimedia\t", + 'wikimania2010wiki' => "#wikimania2010.wikipedia\t", + 'wikimania2011wiki' => "#wikimania2011.wikipedia\t", + 'wikimania2012wiki' => "#wikimania2012.wikipedia\t", + 'wikimania2013wiki' => "#wikimania2013.wikipedia\t", + 'wikimania2014wiki' => "#wikimania2014.wikipedia\t", + 'wikimaniateamwiki' => "#wikimaniateam.wikipedia\t", ), # wgNamespacesToBeSearchedDefault @{ -- To view, visit https://gerrit.wikimedia.org/r/47307 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I249fa712aed7d8b180ec9508f6804df7c624c77a Gerrit-PatchSet: 9 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: MZMcBride <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
