From b2eb69c98ddf2429be6e690ee7f93e72b8201882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Fri, 23 Mar 2012 09:26:29 +0200
Subject: [PATCH] Fixed some depencies from wiki::collab::base.

---
 wiki/manifests/init.pp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp
index 67d6007..03733e4 100644
--- a/wiki/manifests/init.pp
+++ b/wiki/manifests/init.pp
@@ -149,11 +149,13 @@ class wiki::collab::base {
     include graphviz::python
     include ldap::client::python
 
+    include apache::sslserver
     include apache::mod::authnz_ldap
     include apache::mod::ldap
     include apache::mod::rewrite
     include apache::mod::wsgi
 
+    include wiki::moin
     include wiki::graphingwiki
     include wiki::opencollab
     include wiki::collab
@@ -211,11 +213,10 @@ class wiki::collab::base {
     }
 
     exec { "collab-copy-underlay":
-        user    => collab,
-        group   => collab,
+        user    => "root",
         path    => "/bin:/usr/bin:/sbin:/usr/sbin",
         cwd     => "${wiki::moin::shared}/underlay",
-        command => "cp -R pages /srv/wikis/collab/underlay && chmod -R g=u,o-rwx /srv/wikis/collab/underlay",
+        command => "cp -R pages /srv/wikis/collab/underlay && chmod -R g=u,o-rwx /srv/wikis/collab/underlay && chown -R collab:collab /srv/wikis/collab/underlay",
         creates => "/srv/wikis/collab/underlay/pages",
         require => File["/srv/wikis/collab/underlay"],
     }