From 8fe2a4701222f0b36f071bd1a1fa064e8a17ef32 Mon Sep 17 00:00:00 2001
From: andreas <andreas@immerda.ch>
Date: Tue, 17 Feb 2009 16:45:52 +0000
Subject: documentroot

---
 manifests/defines/vhost_files.pp     | 2 +-
 manifests/defines/vhost_varieties.pp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/defines/vhost_files.pp b/manifests/defines/vhost_files.pp
index 26e137e..790c9bb 100644
--- a/manifests/defines/vhost_files.pp
+++ b/manifests/defines/vhost_files.pp
@@ -253,7 +253,7 @@ define apache::vhost::template(
 }
 
 
-define apache::vhost::file::documentrootfile($filename,$thedomain){
+define apache::vhost::file::documentrootfile($documentroot,$filename,$thedomain){
     file{"$documentroot/$filename":
         source => [ "puppet://$server/files/apache/vhost_varieties/$fqdn/$thedomain/$filename",
                     "puppet://$server/files/apache/vhost_varieties/$apache_cluster_node/$thedomain/$filename",
diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp
index 87d22e7..465c589 100644
--- a/manifests/defines/vhost_varieties.pp
+++ b/manifests/defines/vhost_varieties.pp
@@ -294,6 +294,7 @@ define apache::vhost::php::joomla(
     }
 
     apache::vhost::file::documentrootfile{"joomlaconfigurationfile":
+        documentroot => $documentroot,
         filename => 'configuration.php',
         thedomain => $name
     }
-- 
cgit v1.2.3