wiki::collab: Added optional support for WSGI daemon mode
This commit is contained in:
parent
07b220391b
commit
1098468803
2 changed files with 17 additions and 0 deletions
|
@ -151,6 +151,10 @@ class wiki::collabbackend inherits wiki::graphingwiki::common {
|
|||
# Conference domain for jabber extauth.
|
||||
# Defaults to conference.$wiki_collab_jabberdomain.
|
||||
#
|
||||
# $collab_daemon:
|
||||
# Bool for whether to use wsgi daemon mode for collab.
|
||||
# Defaults to false.
|
||||
#
|
||||
class wiki::collab {
|
||||
|
||||
include cairo::python
|
||||
|
@ -361,6 +365,13 @@ class wiki::collab {
|
|||
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":
|
||||
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",
|
||||
cwd => "/",
|
||||
|
|
6
wiki/templates/collab-wsgi.conf.erb
Normal file
6
wiki/templates/collab-wsgi.conf.erb
Normal file
|
@ -0,0 +1,6 @@
|
|||
WSGIDaemonProcess collab user=collab group=collab umask=0007 threads=25
|
||||
|
||||
<Directory "<%= collab_webroot %>">
|
||||
WSGIProcessGroup collab
|
||||
WSGIRestrictProcess collab
|
||||
</Directory>
|
Loading…
Add table
Reference in a new issue