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

Added support for multiple collab virtualhosts

Browse source
This commit is contained in:
Ossi Salmi 2011-07-06 16:42:44 +03:00 • committed by Timo Mkinen
parent 0f87959499
commit 4855c4111e
4 changed files with 38 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +0,0 @@
<Directory "/srv/www/https/<%= wiki_collab_fqdn %>/collab">
Options +ExecCGI
AllowOverride All
</Directory>

6
wiki/templates/collab.ini.erb
View file

@ -17,9 +17,9 @@ piddir=/srv/wikis/collab/run
helperuser=collab
## for collab-auth-ejabberd
cacherefreshtime=30
<% if has_variable?("wiki_collab_jabberdomain") -%>
<% if has_variable?("collab_jabberdomain") -%>
[jabber]
## also in ejabberd.cfg
jabberdomain=<%= wiki_collab_jabberdomain %>
conferencedomain=<%= wiki_collab_conferencedomain %>
jabberdomain=<%= collab_jabberdomain %>
conferencedomain=<%= collab_conferencedomain %>
<% end -%>