From e54ddd4b8afd640d094ea19d00b847688fd6754c Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Sun, 23 Nov 2014 23:44:47 +0000
Subject: [PATCH] Pass install_dir through to webapp_config to install into the
 right location

---
 manifests/install.pp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/manifests/install.pp b/manifests/install.pp
index 313baa0..a9cd0f2 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -8,6 +8,7 @@ class dokuwiki::install (
     $package_name      = $dokuwiki::package_name,
     $use_webapp_config = $dokuwiki::use_webapp_config,
     $vhost             = $dokuwiki::vhost,
+    $install_dir       = $dokuwiki::install_dir,
     $base_path         = $dokuwiki::base_path,
 ) {
 
@@ -21,12 +22,13 @@ class dokuwiki::install (
     if $use_webapp_config {
         webapp_config {
             "dokuwiki-${version}":
-                action  => 'install',
-                vhost   => $vhost,
-                base    => $base_path,
-                app     => 'dokuwiki',
-                version => $version,
-                depends => Package['www-apps/dokuwiki'];
+                action     => 'install',
+                vhost      => $vhost,
+                installdir => $install_dir,
+                base       => $base_path,
+                app        => 'dokuwiki',
+                version    => $version,
+                depends    => Package['www-apps/dokuwiki'];
         }
     }