jenkins-bot has submitted this change and it was merged.
Change subject: Update RC2UDP config to use $wgRCFeeds
......................................................................
Update RC2UDP config to use $wgRCFeeds
Some legacy MW globals changed for wmg as wikimedia config specific
Might aswell update config when it's fresh, rather than when it's
being removed from core!
Change-Id: Ifc2d296902178b662bd6c24637f2d5df5307cba8
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 23 insertions(+), 10 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d7b1dea..f5f7bf3 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1197,7 +1197,8 @@
# Broken -- TS
if( $wmfRealm == 'production' ) {
- $wgCentralAuthUDPAddress = $wgRC2UDPAddress;
+ $wgRC2UDPPort = $wmgRC2UDPPort;
+ $wgCentralAuthUDPAddress = $wmgRC2UDPAddress;
$wgCentralAuthNew2UDPPrefix = "#central\t";
}
@@ -2615,12 +2616,20 @@
// 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";
+if ( $wmgUseRC2UDP ) {
+ if ( $wmgRC2UDPPrefix === false ) {
+ $matches = null;
+ if ( preg_match( '/^\/\/(.+).org$/', $wgServer, $matches ) &&
isset( $matches[1] ) ) {
+ $wmgRC2UDPPrefix = "#{$matches[1]}\t";
+ }
}
+
+ $wgRCFeeds['default'] = array(
+ 'formatter' => 'IRCColourfulRCFeedFormatter',
+ 'uri' =>
"udp://$wmgRC2UDPAddress:$wmgRC2UDPPort/$wmgRC2UDPPrefix",
+ 'add_interwiki_prefix' => false,
+ 'omit_bots' => false,
+ );
}
// Confirmed can do anything autoconfirmed can.
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index f4498ec..1595684 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -6245,16 +6245,20 @@
'default' => array( 'DB' ),
),
-'wgRC2UDPAddress' => array(
- 'default' => '208.80.152.178', // pmtpa: ekrem
+'wmgUseRC2UDP' => array(
+ 'default' => true,
'private' => false,
),
-'wgRC2UDPPort' => array(
+'wmgRC2UDPAddress' => array(
+ 'default' => '208.80.152.178', // pmtpa: ekrem
+),
+
+'wmgRC2UDPPort' => array(
'default' => 9390,
),
-'wgRC2UDPPrefix' => array(
+'wmgRC2UDPPrefix' => array(
'default' => false,
'advisorywiki' => "#advisory.wikipedia\t",
'arbcom_dewiki' => "#arbcom-de.wikipedia\t",
--
To view, visit https://gerrit.wikimedia.org/r/92455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc2d296902178b662bd6c24637f2d5df5307cba8
Gerrit-PatchSet: 6
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Krinkle <[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
