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

wiki::collab: Added optional support for WSGI daemon mode

Browse source
This commit is contained in:
Ossi Salmi 2013-04-16 15:37:50 +03:00
parent 07b220391b
commit 1098468803
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
wiki/manifests/init.pp
View file

@ -151,6 +151,10 @@ class wiki::collabbackend inherits wiki::graphingwiki::common {
# Conference domain for jabber extauth. # Conference domain for jabber extauth.
# Defaults to conference.$wiki_collab_jabberdomain. # Defaults to conference.$wiki_collab_jabberdomain.
# #
# $collab_daemon:
# Bool for whether to use wsgi daemon mode for collab.
# Defaults to false.
#
class wiki::collab { class wiki::collab {
include cairo::python include cairo::python
@ -361,6 +365,13 @@ class wiki::collab {
content => template("wiki/collab-httpd.conf.erb"), content => template("wiki/collab-httpd.conf.erb"),
} }
if $collab_daemon == true {
apache::configfile { "wsgi_collab.conf":
http => false,
content => template("wiki/collab-wsgi.conf.erb"),
}
}
exec { "collab-create collab collab": exec { "collab-create collab collab":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin", path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
cwd => "/", cwd => "/",

6
wiki/templates/collab-wsgi.conf.erb Normal file
View file

@ -0,0 +1,6 @@
WSGIDaemonProcess collab user=collab group=collab umask=0007 threads=25
<Directory "<%= collab_webroot %>">
WSGIProcessGroup collab
WSGIRestrictProcess collab
</Directory>