From 10984688032ab6d03d57cd642ce0c307bb497eea Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Tue, 16 Apr 2013 15:37:50 +0300
Subject: [PATCH] wiki::collab: Added optional support for WSGI daemon mode

---
 wiki/manifests/init.pp              | 11 +++++++++++
 wiki/templates/collab-wsgi.conf.erb |  6 ++++++
 2 files changed, 17 insertions(+)
 create mode 100644 wiki/templates/collab-wsgi.conf.erb

diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp
index aae09fd..4cb24df 100644
--- a/wiki/manifests/init.pp
+++ b/wiki/manifests/init.pp
@@ -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     => "/",
diff --git a/wiki/templates/collab-wsgi.conf.erb b/wiki/templates/collab-wsgi.conf.erb
new file mode 100644
index 0000000..07b4ec1
--- /dev/null
+++ b/wiki/templates/collab-wsgi.conf.erb
@@ -0,0 +1,6 @@
+WSGIDaemonProcess collab user=collab group=collab umask=0007 threads=25
+
+<Directory "<%= collab_webroot %>">
+  WSGIProcessGroup collab
+  WSGIRestrictProcess collab
+</Directory>