jenkins-bot has submitted this change and it was merged.
Change subject: More wikitech cleanup
......................................................................
More wikitech cleanup
Leave only specific wikitech extension-related stuff in wikitech.php, and
re-arrange it a bit.
Removed default wgOpenStackManagerRestrictedRegions and
wgOpenStackManagerReadOnlyRegions
Bug: T75939
Change-Id: Ibc17521b801c6fe0cae355f2929544bd09e585d2
---
M wmf-config/CommonSettings.php
M wmf-config/wikitech.php
2 files changed, 24 insertions(+), 26 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index cd5afd7..e010c6b 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -304,7 +304,13 @@
}
// Use the cache setup above and configure sessions caching
-$wgSessionCacheType = 'sessions';
+if ( $wgDBname === 'labswiki' ) {
+ $wgSessionCacheType = 'memcached-pecl';
+ $wgMessageCacheType = 'memcached-pecl';
+ $wgCookieDomain = "wikitech.wikimedia.org";
+} else {
+ $wgSessionCacheType = 'sessions';
+}
$wgSessionsInObjectCache = true;
session_name( $lang . 'wikiSession' );
@@ -1123,6 +1129,10 @@
if ( $wmgEmergencyCaptcha ) {
$wgCaptchaTriggers['edit'] = true;
$wgCaptchaTriggers['create'] = true;
+ }
+
+ if ( $wgDBname === 'labswiki' ) {
+ $wgCaptchaTriggers['addurl'] = false;
}
}
@@ -2722,7 +2732,13 @@
}
if ( $wgDBname == 'labswiki' ) {
- // A zillion wikitech-specific settings
+ $wgEmailConfirmToEdit = true;
+ $wgEnableCreativeCommonsRdf = true;
+
+ // Don't depend on other DB servers
+ $wgDefaultExternalStore = false;
+
+ // Some settings specific to wikitech's extensions
include( "$wmfConfigDir/wikitech.php" );
}
diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index cd0f56f..ec98d99 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -2,10 +2,6 @@
# WARNING: This file is publically viewable on the web.
# Do not put private data here.
-$wgEmailConfirmToEdit = true;
-$wgEnableCreativeCommonsRdf = true;
-$wgCaptchaTriggers['addurl'] = false;
-
require_once( "$IP/extensions/Validator/Validator.php" );
require_once( "$IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php" );
require_once( "$IP/extensions/SemanticForms/SemanticForms.php" );
@@ -37,6 +33,10 @@
$wgLDAPLowerCaseUsername = array( 'labs' => false, 'invaliddomain' => false );
// Only enable UseLocal if you need to promote an LDAP user
#$wgLDAPUseLocal = true;
+
+require_once( '/srv/mediawiki/private/WikitechPrivateLdapSettings.php' );
+#$wgLDAPDebug = 5;
+#$wgDebugLogGroups["ldap"] = "/tmp/ldap-s-1-debug.log";
require_once( "$IP/extensions/OpenStackManager/OpenStackManager.php" );
$wgOpenStackManagerNovaKeypairStorage = 'ldap';
@@ -121,30 +121,12 @@
$wgOpenStackManagerProxyGateways = array( 'eqiad' => '208.80.155.156' );
-# Restrict eqiad to a group
-$wgOpenStackManagerRestrictedRegions = array();
-$wgOpenStackManagerReadOnlyRegions = array();
-
# TODO: Re-enable OpenID
-#require_once("$IP/extensions/OpenID/OpenID.php");
+#require_once( "$IP/extensions/OpenID/OpenID.php" );
#$wgOpenIDClientOnly = false;
#$wgHideOpenIDLoginLink = true;
#$wgOpenIDConsumerAllow = '';
#$wgOpenIDConsumerDenyByDefault = true;
require_once( "$IP/extensions/OATHAuth/OATHAuth.php" );
-require_once( "$IP/extensions/DynamicSidebar/DynamicSidebar.php" );
-
-$wgMessageCacheType = 'memcached-pecl';
-$wgSessionCacheType = 'memcached-pecl';
-$wgCookieDomain = "wikitech.wikimedia.org";
-
-// No cluster for us!
-$wgDefaultExternalStore = false;
-
-require_once( '/srv/mediawiki/private/WikitechPrivateLdapSettings.php' );
-
-#$wgPasswordReminderResendTime = 0;
-#$wgPasswordAttemptThrottle = false;
-#$wgLDAPDebug = 5;
-#$wgDebugLogGroups["ldap"] = "/tmp/ldap-s-1-debug.log";
+require_once( "$IP/extensions/DynamicSidebar/DynamicSidebar.php" );
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/221729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc17521b801c6fe0cae355f2929544bd09e585d2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
