ben/puppet-dokuwiki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass install_dir through to webapp_config to install into the right location

Browse Source
This commit is contained in:
Ben Roberts
2014-11-23 23:44:47 +00:00
parent ea5946187f
commit e54ddd4b8a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/install.pp
View File

@@ -8,6 +8,7 @@ class dokuwiki::install (
$package_name = $dokuwiki::package_name, $package_name = $dokuwiki::package_name,
$use_webapp_config = $dokuwiki::use_webapp_config, $use_webapp_config = $dokuwiki::use_webapp_config,
$vhost = $dokuwiki::vhost, $vhost = $dokuwiki::vhost,
$install_dir = $dokuwiki::install_dir,
$base_path = $dokuwiki::base_path, $base_path = $dokuwiki::base_path,
) { ) {
@@ -21,12 +22,13 @@ class dokuwiki::install (
if $use_webapp_config { if $use_webapp_config {
webapp_config { webapp_config {
"dokuwiki-${version}": "dokuwiki-${version}":
action => 'install', action => 'install',
vhost => $vhost, vhost => $vhost,
base => $base_path, installdir => $install_dir,
app => 'dokuwiki', base => $base_path,
version => $version, app => 'dokuwiki',
depends => Package['www-apps/dokuwiki']; version => $version,
depends => Package['www-apps/dokuwiki'];
} }
} }