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

Merge branch 'puppet3'

Browse source 
Conflicts:
	ntpd/templates/ntp.conf.erb
	wiki/templates/collab-wsgi.conf.erb
This commit is contained in:
Ossi Salmi 2013-05-24 10:10:57 +03:00
commit 49a8ae3004
112 changed files with 522 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
<Directory "<%= collab_webroot %>">
<Directory "<%= @collab_webroot %>">
Options +ExecCGI
AllowOverride All
</Directory>

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

@ -1,6 +1,6 @@
WSGIDaemonProcess collab user=collab group=collab umask=0007 processes=<%= processorcount %> threads=15 maximum-requests=4000
WSGIDaemonProcess collab user=collab group=collab umask=0007 processes=<%= @processorcount %> threads=15 maximum-requests=4000
<Directory "<%= collab_webroot %>">
<Directory "<%= @collab_webroot %>">
WSGIProcessGroup collab
WSGIRestrictProcess collab
</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?("collab_jabberdomain") -%>
<% if @collab_jabberdomain -%>
[jabber]
## also in ejabberd.cfg
jabberdomain=<%= collab_jabberdomain %>
conferencedomain=<%= collab_conferencedomain %>
jabberdomain=<%= @collab_jabberdomain %>
conferencedomain=<%= @collab_conferencedomain %>
<% end -%>