From e91131f664df33f580ea613286a9b1bab11b0417 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sat, 20 Aug 2016 14:23:25 +0000 Subject: [PATCH] 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 --- manifests/init.pp | 3 +++ templates/Settings.php.erb | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 6a9948b..4d0a11b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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, diff --git a/templates/Settings.php.erb b/templates/Settings.php.erb index 47e8586..a1b0304 100644 --- a/templates/Settings.php.erb +++ b/templates/Settings.php.erb @@ -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