From 5b12b921b349f23fb1c924afb6803b05dbf1e9aa Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Thu, 2 May 2013 23:19:20 +0300
Subject: [PATCH] Puppet 3 fixes for ejabberd and vsroom

---
 ejabberd/manifests/init.pp | 6 ++++--
 vsroom/manifests/init.pp   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ejabberd/manifests/init.pp b/ejabberd/manifests/init.pp
index b06b93c..ec31ab8 100644
--- a/ejabberd/manifests/init.pp
+++ b/ejabberd/manifests/init.pp
@@ -156,7 +156,7 @@ class ejabberd {
 
     $htdocs = "/usr/share/ejabberd/htdocs"
 
-    define configwebhost() {
+    define configwebhost($htdocs) {
         file { "/srv/www/https/${name}/bosh":
             ensure  => link,
             target  => $htdocs,
@@ -187,7 +187,9 @@ class ejabberd {
             source => "puppet:///modules/ejabberd/ejabberd-httpd.conf",
         }
 
-        configwebhost { $ejabberd_webhosts: }
+        configwebhost { $ejabberd_webhosts:
+            htdocs => $htdocs,
+        }
     }
 
 }
diff --git a/vsroom/manifests/init.pp b/vsroom/manifests/init.pp
index c729fcc..1f682f3 100644
--- a/vsroom/manifests/init.pp
+++ b/vsroom/manifests/init.pp
@@ -106,7 +106,7 @@ class vsroom::common {
         require => Python::Setup::Install["/usr/local/src/vsroom"],
     }
 
-    define configwebhost() {
+    define configwebhost($htdocs) {
         file { "/srv/www/https/${name}/vsroom":
             ensure  => link,
             target  => $htdocs,
@@ -120,7 +120,9 @@ class vsroom::common {
             source => "puppet:///modules/vsroom/vsroom-httpd.conf",
         }
 
-        configwebhost { $vsroom_webhosts: }
+        configwebhost { $vsroom_webhosts:
+            htdocs => $htdocs,
+        }
     }
 
 }