Parameterize database connection settings

So that we can have non-local (e.g., Trove based) databases, and for
general downstream flexibility, allow the database server hostname,
database name and database username to be passed into this module by
the caller.

Change-Id: I26a03e2ce9a6bf8bcd6acbad9e8eaaa98e0f26ab
This commit is contained in:
Jeremy Stanley 2016-08-20 14:23:25 +00:00
parent c4044a9766
commit e91131f664
2 changed files with 6 additions and 3 deletions

View File

@ -15,6 +15,9 @@ class mediawiki(
$wg_recaptchapublickey = undef,
$wg_recaptchaprivatekey = undef,
$wg_googleanalyticsaccount = undef,
$wg_dbserver = 'localhost',
$wg_dbname = 'openstack_wiki',
$wg_dbuser = 'wikiuser',
$wg_dbpassword = undef,
$wg_secretkey = undef,
$wg_upgradekey = undef,

View File

@ -39,9 +39,9 @@ $wgEmailAuthentication = true;
## Database settings
$wgDBtype = "mysql";
$wgDBserver = "localhost";
$wgDBname = "openstack_wiki";
$wgDBuser = "wikiuser";
$wgDBserver = "<%= @wg_dbserver %>";
$wgDBname = "<%= @wg_dbname %>";
$wgDBuser = "<%= @wg_dbuser %>";
$wgDBpassword = "<%= @wg_dbpassword %>";
# MySQL specific settings