tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wiki: Handle collab_webroot as array

Browse source
This commit is contained in:
Ossi Salmi 2013-08-21 15:15:21 +03:00
parent 86a06817bd
commit 6d3af17844
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wiki/manifests/init.pp
View file

@ -141,8 +141,8 @@ class wiki::collabbackend inherits wiki::graphingwiki::common {
# List of collab virtual hosts. # List of collab virtual hosts.
# #
# $collab_webroot: # $collab_webroot:
# Path to collab in webserver document root. # List of collab paths in webserver document root.
# Defaults to "/srv/www/https/*/collab". # Defaults to ["/srv/www/https/*/collab"].
# #
# $collab_jabberdomain: # $collab_jabberdomain:
# Domain for jabber extauth. # Domain for jabber extauth.
@ -364,7 +364,7 @@ class wiki::collab {
} }
if !$collab_webroot { if !$collab_webroot {
$collab_webroot = "/srv/www/https/*/collab" $collab_webroot = ["/srv/www/https/*/collab"]
} }
apache::configfile { "collab.conf": apache::configfile { "collab.conf":

4
wiki/templates/collab-httpd.conf.erb
View file

@ -1,4 +1,6 @@
<Directory "<%= @collab_webroot %>"> <% @collab_webroot.each do |directory| -%>
<Directory "<%= directory %>">
Options +ExecCGI Options +ExecCGI
AllowOverride All AllowOverride All
</Directory> </Directory>
<% end -%>