Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250170
Change subject: Clean up some file_exists checks
......................................................................
Clean up some file_exists checks
Change-Id: Ie21ed1732a18ee0557d0d391bb15de678fda0929
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
D wmf-config/ext-labs.php
D wmf-config/ext-production.php
5 files changed, 19 insertions(+), 61 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/70/250170/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 8537f25..2d099e8 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -416,18 +416,16 @@
# Squid Configuration
#######################################################################
-if ( $wmgUseClusterSquid ) {
- $wgUseSquid = true;
- $wgUseESI = false;
-
- require( getRealmSpecificFilename( "$wmfConfigDir/squid.php" ) );
-}
+$wgUseSquid = true;
+$wgUseESI = false;
if ( $wmfRealm === 'production' ) {
$wgStatsdServer = 'statsd.eqiad.wmnet';
+ require( "$wmfConfigDir/squid.php" );
} elseif ( $wmfRealm === 'labs' ) {
$wgStatsdServer = 'labmon1001.eqiad.wmnet';
$wgStatsdMetricPrefix = 'BetaMediaWiki';
+ require( "$wmfConfigDir/squid-labs.php" );
}
// CORS (cross-domain AJAX, T22814)
@@ -497,11 +495,7 @@
$wgTimelineSettings->fontFile = 'unifont-5.1.20080907.ttf';
}
$wgTimelineSettings->fileBackend = 'local-multiwrite';
-
- if ( file_exists( '/usr/bin/ploticus' ) ) {
- $wgTimelineSettings->ploticusCommand = '/usr/bin/ploticus';
- }
-
+ $wgTimelineSettings->ploticusCommand = '/usr/bin/ploticus';
$wgTimelineSettings->epochTimestamp = '20130601000000';
}
@@ -2938,14 +2932,14 @@
// additional "language names", adding to Names.php data
$wgExtraLanguageNames = $wmgExtraLanguageNames;
-if ( file_exists( "$wmfConfigDir/CommonSettings-$wmfRealm.php" ) ) {
- require( "$wmfConfigDir/CommonSettings-$wmfRealm.php" );
+
+if ( $wmfRealm === 'labs' ) {
+ require( "$wmfConfigDir/CommonSettings-labs.php" );
}
-#### Per realm extensions
-
-if ( file_exists( "$wmfConfigDir/ext-$wmfRealm.php" ) ) {
- require( "$wmfConfigDir/ext-$wmfRealm.php" );
+if ( $wmgUseCheckUser ) {
+ include( $IP . '/extensions/CheckUser/CheckUser.php' );
+ $wgCheckUserForceSummary = $wmgCheckUserForceSummary;
}
// T39211
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 3f8a89a..fb9ec7a 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -1056,6 +1056,10 @@
'default' => true,
),
+ 'wmgUseCheckUser' => array(
+ 'default' => false,
+ ),
+
'wmgGraphImgServiceAlways' => array(
'default' => true,
),
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 9691ffd..af51697 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15767,6 +15767,10 @@
'default' => true,
),
+'wmgUseCheckUser' => array(
+ 'default' => true,
+),
+
);
diff --git a/wmf-config/ext-labs.php b/wmf-config/ext-labs.php
deleted file mode 100644
index bb240fe..0000000
--- a/wmf-config/ext-labs.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-# WARNING: This file is publically viewable on the web.
-# Do not put private data here.
-
-#######################################################################
-#
-# This file list extension includes and configuration on beta
-#
-#######################################################################
-
-if( $wmfRealm === 'labs' ) { # safeguard
-
-// Deployed by Petrb as a part of review.
-// This extension is scheduled for review and deployment on enwiki
-// Do not remove this extension, without contacting Petr Bena
-if ($wgDBname == "enwiki") {
- # commented by hashar on 20121116, cause message cache issue on
- # beta with the magic word it introduces.
- # Been disabled by a live hack since last week at least.
- //include ("$IP/extensions/OnlineStatusBar/OnlineStatusBar.php");
-}
-
-
-} # safeguard
diff --git a/wmf-config/ext-production.php b/wmf-config/ext-production.php
deleted file mode 100644
index 74fb618..0000000
--- a/wmf-config/ext-production.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-# WARNING: This file is publically viewable on the web.
-# Do not put private data here.
-
-#######################################################################
-#
-# This file list extension includes and configuration on production
-#
-#######################################################################
-
-if( $wmfRealm === 'production' ) { # safeguard
-
- include( $IP . '/extensions/CheckUser/CheckUser.php' );
- $wgCheckUserForceSummary = $wmgCheckUserForceSummary;
-
-
-
-} # safeguard
--
To view, visit https://gerrit.wikimedia.org/r/250170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie21ed1732a18ee0557d0d391bb15de678fda0929
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
