Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/220847
Change subject: Revert "Revert "Pull out unnecessary wikitech settings, move
some into CommonSettings""
......................................................................
Revert "Revert "Pull out unnecessary wikitech settings, move some into
CommonSettings""
This reverts commit 39989e68515181ac6005f10ec369c7b2a4445941.
Change-Id: I9b4450a7cb888ab6619739cdf25b124757e77de6
---
M wmf-config/CommonSettings.php
M wmf-config/wikitech.php
2 files changed, 3 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/47/220847/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0cc5fd0..cd5afd7 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -258,7 +258,6 @@
$wgUseGzip = true;
$wgRCMaxAge = 30 * 86400;
-$wgUseTeX = true;
$wgTmpDirectory = '/tmp';
$wgSQLMode = null;
@@ -850,6 +849,8 @@
if ( $wmgUseClusterFileBackend ) {
# Cluster-dependent files for file backend
require( getRealmSpecificFilename( "$wmfConfigDir/filebackend.php" ) );
+} else {
+ $wgUseInstantCommons = true;
}
if ( $wmgUseClusterJobqueue ) {
diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index 5a2a4d9..4abbe76 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -2,26 +2,15 @@
# WARNING: This file is publically viewable on the web.
# Do not put private data here.
-/* From Settings.php on old wikitech */
-
$wgEmailConfirmToEdit = true;
-$wgUseTeX = false;
$wgEnableCreativeCommonsRdf = true;
-
-$wgUseInstantCommons = true;
-
$wgCaptchaTriggers['addurl'] = false;
-
-/* from Local.php on old Wikitech */
-$wgPasswordSenderName = "Wikitech Mail";
-
-$wgCookieDomain = "wikitech.wikimedia.org";
require_once( "$IP/extensions/Validator/Validator.php" );
require_once( "$IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php" );
require_once( "$IP/extensions/SemanticForms/SemanticForms.php" );
require_once( "$IP/extensions/SemanticResultFormats/SemanticResultFormats.php"
);
-enableSemantics('wikitech');
+enableSemantics( 'wikitech' );
require_once( "$IP/extensions/LdapAuthentication/LdapAuthentication.php" );
$wgAuth = new LdapAuthenticationPlugin();
@@ -146,10 +135,7 @@
require_once( "$IP/extensions/OATHAuth/OATHAuth.php" );
require_once( "$IP/extensions/DynamicSidebar/DynamicSidebar.php" );
-$wgMainCacheType = 'memcached-pecl';
$wgMessageCacheType = 'memcached-pecl';
-
-$wgSessionsInObjectCache = true;
$wgSessionCacheType = 'memcached-pecl';
// No cluster for us!
@@ -159,6 +145,5 @@
#$wgPasswordReminderResendTime = 0;
#$wgPasswordAttemptThrottle = false;
-#$wgShowExceptionDetails = true;
#$wgLDAPDebug = 5;
#$wgDebugLogGroups["ldap"] = "/tmp/ldap-s-1-debug.log";
--
To view, visit https://gerrit.wikimedia.org/r/220847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b4450a7cb888ab6619739cdf25b124757e77de6
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
