From 6d3af17844511399cedb266cc89f800fbf3bddb3 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 21 Aug 2013 15:15:21 +0300
Subject: [PATCH] wiki: Handle collab_webroot as array

---
 wiki/manifests/init.pp               | 6 +++---
 wiki/templates/collab-httpd.conf.erb | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp
index 3a00c07..4015dc5 100644
--- a/wiki/manifests/init.pp
+++ b/wiki/manifests/init.pp
@@ -141,8 +141,8 @@ class wiki::collabbackend inherits wiki::graphingwiki::common {
 #       List of collab virtual hosts.
 #
 #   $collab_webroot:
-#       Path to collab in webserver document root.
-#       Defaults to "/srv/www/https/*/collab".
+#       List of collab paths in webserver document root.
+#       Defaults to ["/srv/www/https/*/collab"].
 #
 #   $collab_jabberdomain:
 #       Domain for jabber extauth.
@@ -364,7 +364,7 @@ class wiki::collab {
     }
 
     if !$collab_webroot {
-        $collab_webroot = "/srv/www/https/*/collab"
+        $collab_webroot = ["/srv/www/https/*/collab"]
     }
 
     apache::configfile { "collab.conf":
diff --git a/wiki/templates/collab-httpd.conf.erb b/wiki/templates/collab-httpd.conf.erb
index 12e513a..c95e0c7 100644
--- a/wiki/templates/collab-httpd.conf.erb
+++ b/wiki/templates/collab-httpd.conf.erb
@@ -1,4 +1,6 @@
-<Directory "<%= @collab_webroot %>">
+<% @collab_webroot.each do |directory| -%>
+<Directory "<%= directory %>">
   Options +ExecCGI
   AllowOverride All
 </Directory>
+<% end -%>