Andrew Bogott has submitted this change and it was merged.
Change subject: Added optional wiki_name setting
......................................................................
Added optional wiki_name setting
Change-Id: I933abc9670f27feed52b0596aed3fe32a7b9c606
---
M modules/mediawiki_singlenode/manifests/init.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki_singlenode/manifests/init.pp
b/modules/mediawiki_singlenode/manifests/init.pp
index 5a56259..69b2205 100644
--- a/modules/mediawiki_singlenode/manifests/init.pp
+++ b/modules/mediawiki_singlenode/manifests/init.pp
@@ -13,6 +13,7 @@
# Memcached memory usage defaults to 128 megs but can be changed via
$memcached_size.
class mediawiki_singlenode( $ensure = 'present',
$database_name = "testwiki",
+ $wiki_name = "testwiki",
$role_requires = [],
$install_path = "/srv/mediawiki",
$role_config_lines = [],
@@ -82,7 +83,7 @@
exec { 'mediawiki_setup':
require => [git::clone["mediawiki"],
File["${install_path}/orig"], exec['password_gen']],
creates => "${install_path}/orig/LocalSettings.php",
- command => "/usr/bin/php
${install_path}/maintenance/install.php testwiki admin --dbname $database_name
--dbuser root --passfile \"${install_path}/orig/adminpass\" --server $mwserver
--scriptpath \"${install_path}\" --confpath \"${install_path}/orig/\"",
+ command => "/usr/bin/php
${install_path}/maintenance/install.php $wiki_name admin --dbname
$database_name --dbuser root --passfile \"${install_path}/orig/adminpass\"
--server $mwserver --scriptpath \"${install_path}\" --confpath
\"${install_path}/orig/\"",
logoutput => "on_failure",
}
--
To view, visit https://gerrit.wikimedia.org/r/51796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I933abc9670f27feed52b0596aed3fe32a7b9c606
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
