jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351100 )
Change subject: private: Update example
......................................................................
private: Update example
* Add any missing variable names that exist and are also referenced in
public wmf-config files so that these files may be included by tests
without errors.
- wmfSwiftConfig
- wmgTranslationNotificationUserPassword
* Alphabetize (mostly).
* Consistently use one of 'example', '', or '*'.
Change-Id: I14c2e2b74f3a117e1b0ee21af6d9e58fa52d967f
---
M private/PrivateSettings.php.example
M tests/cirrusTest.php
2 files changed, 22 insertions(+), 14 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/private/PrivateSettings.php.example
b/private/PrivateSettings.php.example
index f8f4c0e..6fcca5f 100644
--- a/private/PrivateSettings.php.example
+++ b/private/PrivateSettings.php.example
@@ -1,16 +1,28 @@
<?php
-# change all of these, and then keep them secret
-$wgDBuser = 'wikiadmin';
-$wgDBpassword = 'blaaaaahblaaaaaahballll';
+$wgDBuser = 'example';
+$wgDBpassword = '*';
-$wmgCaptchaSecret = 'boomboompow';
+$wmgCaptchaSecret = '*';
+$wmgCaptchaPassword = '*';
-$wmgRedisPassword = 'isitjustlove';
+$wmgLogstashPassword = '*';
-$wmgZeroPortalApiUserName = 'zscript';
-$wmgZeroPortalApiPassword = 'zscript1';
+$wmgRedisPassword = '*';
-$wmgVERPsecret = 'tuttut';
+$wmgTranslationNotificationUserPassword = '*';
-$wmgLogstashPassword = 'neenenee';
+$wmgVERPsecret = '*';
+
+$wmgZeroPortalApiUserName = 'example';
+$wmgZeroPortalApiPassword = '*';
+
+$wmfSwiftEqiadConfig = $wmfSwiftCodfwConfig = [
+ 'cirrusAuthUrl' => '',
+ 'cirrusUser' => '',
+ 'cirrusKey' => '',
+];
+$wmfSwiftConfig = [
+ 'eqiad' => $wmfSwiftEqiadConfig,
+ 'codfw' => $wmfSwiftCodfwConfig,
+];
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index eec305a..1e47099 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -98,6 +98,7 @@
private function loadCirrusConfig( $wmfRealm, $wgDBname, $dbSuffix ) {
$wmfConfigDir = __DIR__ . "/../wmf-config";
+ require __DIR__ . '/../private/PrivateSettings.php.example';
require __DIR__ . '/TestServices.php';
$wgConf = $this->loadWgConf( $wmfRealm );
@@ -137,11 +138,6 @@
$wgJobTypeConf = array( 'default' => array() );
$wgCirrusSearchWeights = array();
$wgCirrusSearchNamespaceWeights = array();
- $wmfSwiftEqiadConfig = array(
- 'cirrusAuthUrl' => '',
- 'cirrusUser' => '',
- 'cirrusKey' => '',
- );
$wmfDatacenter = 'unittest';
$wgCirrusSearchPoolCounterKey =
'unittest:poolcounter:blahblahblah';
// not used for anything, just to prevent undefined variable
--
To view, visit https://gerrit.wikimedia.org/r/351100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14c2e2b74f3a117e1b0ee21af6d9e58fa52d967f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
