Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/323349
Change subject: Phabricator: Allow setting mysql.user and mysql.pass (part2)
......................................................................
Phabricator: Allow setting mysql.user and mysql.pass (part2)
This will add it to local.config now.
Change-Id: I2801f0946419dd1cda9235cf5cf4ac38d4fdd2a4
---
M modules/role/manifests/phabricator/main.pp
1 file changed, 16 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/323349/1
diff --git a/modules/role/manifests/phabricator/main.pp
b/modules/role/manifests/phabricator/main.pp
index e461112..31aa9d6 100644
--- a/modules/role/manifests/phabricator/main.pp
+++ b/modules/role/manifests/phabricator/main.pp
@@ -88,6 +88,20 @@
},
}
+ $phab_admin_user = hiera('phabricator_admin_user', undef)
+ $phab_admin_pass = hiera('phabricator_admin_pass', undef)
+
+ if $phab_mysql_admin_user == undef {
+ $mysql_user = $passwords::mysql::phabricator::admin_user
+ } else {
+ $mysql_user = $phab_mysql_admin_user
+ }
+
+ if $phab_mysql_admin_pass == undef {
+ $mysql_pass = $passwords::mysql::phabricator::admin_pass
+ } else {
+ $mysql_pass = $phab_mysql_admin_pass
+ }
# lint:ignore:arrow_alignment
class { '::phabricator':
@@ -97,8 +111,8 @@
'bugzilla.wikimedia.org',
'bugs.wikimedia.org' ],
trusted_proxies => $cache_misc_nodes[$::site],
- mysql_admin_user => $passwords::mysql::phabricator::admin_user,
- mysql_admin_pass => $passwords::mysql::phabricator::admin_pass,
+ mysql_admin_user => $mysql_user,
+ mysql_admin_pass => $mysql_pass,
libraries => [ "${phab_root_dir}/libext/Sprint/src",
"${phab_root_dir}/libext/security/src",
"${phab_root_dir}/libext/misc/" ],
--
To view, visit https://gerrit.wikimedia.org/r/323349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2801f0946419dd1cda9235cf5cf4ac38d4fdd2a4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
