jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused variables and commented-out code from
CommonSettings
......................................................................
Remove unused variables and commented-out code from CommonSettings
Bug: 29902
Change-Id: Ifcd46c671749f70498b2b35e2a568b4ef8562ec0
---
M wmf-config/CommonSettings.php
M wmf-config/db-eqiad.php
2 files changed, 1 insertion(+), 7 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index bb157ef..4001030 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -25,7 +25,6 @@
if ( PHP_SAPI == 'cli' ) {
# Override for sanity's sake.
ini_set( 'display_errors', 1 );
- # error_reporting(E_ALL);
}
if ( isset( $_SERVER['SERVER_ADDR'] ) ) {
ini_set( 'error_append_string', ' (' . $_SERVER['SERVER_ADDR'] . ')' );
@@ -51,7 +50,7 @@
# The possible values as of June 2012 are:
# - labs
# - production
-$wmfRealm = 'production';
+$wmfRealm = 'production';
# Puppet provision the realm in /etc/wikimedia-realm
if( file_exists( '/etc/wikimedia-realm' ) ) {
@@ -704,7 +703,6 @@
$wgEnableTranscode = $wgEnableUploads;
$wgOggThumbLocation = false; // use ffmpeg for performance
- // $wgOggThumbLocation = '/usr/bin/oggThumb';
//tmh1/2 have 12 cores and need lots of shared memory
//for avconv / ffmpeg2theora
@@ -1159,7 +1157,6 @@
if ( $wmfRealm !== 'labs' ) {
$wgCaptchaFileBackend = 'global-multiwrite';
}
- # $wgCaptchaTriggers['edit'] = true;
$wgCaptchaSecret = $wmgCaptchaSecret;
$wgCaptchaDirectory = '/mnt/upload7/private/captcha';
$wgCaptchaDirectoryLevels = 3;
@@ -1210,8 +1207,6 @@
include "$IP/extensions/CentralAuth/CentralAuth.php";
$wgCentralAuthDryRun = false;
- # unset( $wgGroupPermissions['*']['centralauth-merge'] );
- # $wgGroupPermissions['sysop']['centralauth-merge'] = true;
$wgGroupPermissions['steward']['centralauth-rename'] = true;
$wgCentralAuthCookies = true;
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 2eb1da1..adf5c7a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -514,7 +514,6 @@
'DB://cluster24',
'DB://cluster25',
);
-$wgMasterWaitTimeout = 2;
$wgDBAvgStatusPoll = 30000;
# $wgLBFactoryConf['readOnlyBySection']['s2'] =
--
To view, visit https://gerrit.wikimedia.org/r/156078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifcd46c671749f70498b2b35e2a568b4ef8562ec0
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Withoutaname <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Manybubbles <[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
