[MediaWiki-commits] [Gerrit] Add some special-case handling for the labtestwiki OpenStack... - change (operations/mediawiki-config)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265145
Change subject: Add some special-case handling for the labtestwiki OpenStack
and ldap setup
..
Add some special-case handling for the labtestwiki OpenStack and ldap setup
Change-Id: I701b79e6708a5ce6f56ff8bf9088d7c73c68ce53
---
M wmf-config/wikitech.php
1 file changed, 36 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/45/265145/1
diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index 68837f3..dbb2d6e 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -6,13 +6,29 @@
require_once( "$IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php" );
require_once( "$IP/extensions/SemanticForms/SemanticForms.php" );
require_once( "$IP/extensions/SemanticResultFormats/SemanticResultFormats.php"
);
-enableSemantics( 'wikitech' );
+
+switch( $wgDBname ) {
+case 'labswiki' :
+ enableSemantics( 'wikitech' );
+break;
+case 'labtestwiki' :
+ enableSemantics( 'labtestwikitech' );
+break;
+}
+
unset( $wgSpecialPages['SMWAdmin'] );
require_once( "$IP/extensions/LdapAuthentication/LdapAuthentication.php" );
$wgAuth = new LdapAuthenticationPlugin();
$wgLDAPDomainNames = array( 'labs');
-$wgLDAPServerNames = array( 'labs' => 'ldap-labs.eqiad.wikimedia.org' );
+switch( $wgDBname ) {
+case 'labswiki' :
+ $wgLDAPServerNames = array( 'labs' => 'ldap-labs.eqiad.wikimedia.org' );
+break;
+case 'labtestwiki' :
+ $wgLDAPServerNames = array( 'labs' =>
'labtestservices2001.wikimedia.org' );
+break;
+}
$wgLDAPSearchAttributes = array( 'labs' => 'cn');
$wgLDAPBaseDNs = array( 'labs' => 'dc=wikimedia,dc=org' );
$wgLDAPUserBaseDNs = array( 'labs' => 'ou=people,dc=wikimedia,dc=org' );
@@ -55,8 +71,25 @@
}
require_once( "$IP/extensions/OpenStackManager/OpenStackManager.php" );
+switch( $wgDBname ) {
+case 'labswiki' :
+ $wgOpenStackManagerNovaIdentityURI =
'http://labcontrol1001.wikimedia.org:35357/v2.0';
+ $wgOpenStackManagerDNSOptions = array(
+ 'enabled' => true,
+ 'servers' => array( 'primary' => 'labcontrol1001.wikimedia.org'
),
+ 'soa' => array( 'hostmaster' => 'hostmaster.wikimedia.org',
'refresh' => '1800', 'retry' => '3600', 'expiry' => '86400', 'minimum' =>
'7200' ),
+ );
+break;
+case 'labtestwiki' :
+ $wgOpenStackManagerNovaIdentityURI =
'http://labtestcontrol2001.wikimedia.org:35357/v2.0';
+ $wgOpenStackManagerDNSOptions = array(
+ 'enabled' => true,
+ 'servers' => array( 'primary' =>
'labtestcontrol2001.wikimedia.org' ),
+ 'soa' => array( 'hostmaster' => 'hostmaster.wikimedia.org',
'refresh' => '1800', 'retry' => '3600', 'expiry' => '86400', 'minimum' =>
'7200' ),
+ );
+break;
+}
$wgOpenStackManagerNovaKeypairStorage = 'ldap';
-$wgOpenStackManagerNovaIdentityURI =
'http://labcontrol1001.wikimedia.org:35357/v2.0';
$wgOpenStackManagerLDAPDomain = 'labs';
$wgOpenStackManagerLDAPProjectBaseDN = 'ou=projects,dc=wikimedia,dc=org';
$wgOpenStackManagerLDAPProjectGroupBaseDN = "ou=groups,dc=wikimedia,dc=org";
@@ -65,11 +98,6 @@
$wgOpenStackManagerLDAPDefaultGid = '500';
$wgOpenStackManagerLDAPDefaultShell = '/bin/bash';
$wgOpenStackManagerLDAPUseUidAsNamingAttribute = true;
-$wgOpenStackManagerDNSOptions = array(
- 'enabled' => true,
- 'servers' => array( 'primary' => 'labcontrol1001.wikimedia.org' ),
- 'soa' => array( 'hostmaster' => 'hostmaster.wikimedia.org',
'refresh' => '1800', 'retry' => '3600', 'expiry' => '86400', 'minimum' =>
'7200' ),
-);
$wgOpenStackManagerPuppetOptions = array(
'enabled' => true,
'defaultclasses' => array(),
--
To view, visit https://gerrit.wikimedia.org/r/265145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I701b79e6708a5ce6f56ff8bf9088d7c73c68ce53
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add some special-case handling for the labtestwiki OpenStack... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Add some special-case handling for the labtestwiki OpenStack
and ldap setup
..
Add some special-case handling for the labtestwiki OpenStack and ldap setup
Change-Id: I701b79e6708a5ce6f56ff8bf9088d7c73c68ce53
---
M wmf-config/wikitech.php
1 file changed, 36 insertions(+), 8 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/wikitech.php b/wmf-config/wikitech.php
index 68837f3..dbb2d6e 100644
--- a/wmf-config/wikitech.php
+++ b/wmf-config/wikitech.php
@@ -6,13 +6,29 @@
require_once( "$IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php" );
require_once( "$IP/extensions/SemanticForms/SemanticForms.php" );
require_once( "$IP/extensions/SemanticResultFormats/SemanticResultFormats.php"
);
-enableSemantics( 'wikitech' );
+
+switch( $wgDBname ) {
+case 'labswiki' :
+ enableSemantics( 'wikitech' );
+break;
+case 'labtestwiki' :
+ enableSemantics( 'labtestwikitech' );
+break;
+}
+
unset( $wgSpecialPages['SMWAdmin'] );
require_once( "$IP/extensions/LdapAuthentication/LdapAuthentication.php" );
$wgAuth = new LdapAuthenticationPlugin();
$wgLDAPDomainNames = array( 'labs');
-$wgLDAPServerNames = array( 'labs' => 'ldap-labs.eqiad.wikimedia.org' );
+switch( $wgDBname ) {
+case 'labswiki' :
+ $wgLDAPServerNames = array( 'labs' => 'ldap-labs.eqiad.wikimedia.org' );
+break;
+case 'labtestwiki' :
+ $wgLDAPServerNames = array( 'labs' =>
'labtestservices2001.wikimedia.org' );
+break;
+}
$wgLDAPSearchAttributes = array( 'labs' => 'cn');
$wgLDAPBaseDNs = array( 'labs' => 'dc=wikimedia,dc=org' );
$wgLDAPUserBaseDNs = array( 'labs' => 'ou=people,dc=wikimedia,dc=org' );
@@ -55,8 +71,25 @@
}
require_once( "$IP/extensions/OpenStackManager/OpenStackManager.php" );
+switch( $wgDBname ) {
+case 'labswiki' :
+ $wgOpenStackManagerNovaIdentityURI =
'http://labcontrol1001.wikimedia.org:35357/v2.0';
+ $wgOpenStackManagerDNSOptions = array(
+ 'enabled' => true,
+ 'servers' => array( 'primary' => 'labcontrol1001.wikimedia.org'
),
+ 'soa' => array( 'hostmaster' => 'hostmaster.wikimedia.org',
'refresh' => '1800', 'retry' => '3600', 'expiry' => '86400', 'minimum' =>
'7200' ),
+ );
+break;
+case 'labtestwiki' :
+ $wgOpenStackManagerNovaIdentityURI =
'http://labtestcontrol2001.wikimedia.org:35357/v2.0';
+ $wgOpenStackManagerDNSOptions = array(
+ 'enabled' => true,
+ 'servers' => array( 'primary' =>
'labtestcontrol2001.wikimedia.org' ),
+ 'soa' => array( 'hostmaster' => 'hostmaster.wikimedia.org',
'refresh' => '1800', 'retry' => '3600', 'expiry' => '86400', 'minimum' =>
'7200' ),
+ );
+break;
+}
$wgOpenStackManagerNovaKeypairStorage = 'ldap';
-$wgOpenStackManagerNovaIdentityURI =
'http://labcontrol1001.wikimedia.org:35357/v2.0';
$wgOpenStackManagerLDAPDomain = 'labs';
$wgOpenStackManagerLDAPProjectBaseDN = 'ou=projects,dc=wikimedia,dc=org';
$wgOpenStackManagerLDAPProjectGroupBaseDN = "ou=groups,dc=wikimedia,dc=org";
@@ -65,11 +98,6 @@
$wgOpenStackManagerLDAPDefaultGid = '500';
$wgOpenStackManagerLDAPDefaultShell = '/bin/bash';
$wgOpenStackManagerLDAPUseUidAsNamingAttribute = true;
-$wgOpenStackManagerDNSOptions = array(
- 'enabled' => true,
- 'servers' => array( 'primary' => 'labcontrol1001.wikimedia.org' ),
- 'soa' => array( 'hostmaster' => 'hostmaster.wikimedia.org',
'refresh' => '1800', 'retry' => '3600', 'expiry' => '86400', 'minimum' =>
'7200' ),
-);
$wgOpenStackManagerPuppetOptions = array(
'enabled' => true,
'defaultclasses' => array(),
--
To view, visit https://gerrit.wikimedia.org/r/265145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I701b79e6708a5ce6f56ff8bf9088d7c73c68ce53
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
