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 @@ -"> +<% @collab_webroot.each do |directory| -%> +"> Options +ExecCGI AllowOverride All +<% end -%>