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"], }