Fixed some depencies from wiki::collab::base.

This commit is contained in:
Timo Mkinen 2012-03-23 09:26:29 +02:00
parent d779ddfc40
commit b2eb69c98d

View file

@ -149,11 +149,13 @@ class wiki::collab::base {
include graphviz::python include graphviz::python
include ldap::client::python include ldap::client::python
include apache::sslserver
include apache::mod::authnz_ldap include apache::mod::authnz_ldap
include apache::mod::ldap include apache::mod::ldap
include apache::mod::rewrite include apache::mod::rewrite
include apache::mod::wsgi include apache::mod::wsgi
include wiki::moin
include wiki::graphingwiki include wiki::graphingwiki
include wiki::opencollab include wiki::opencollab
include wiki::collab include wiki::collab
@ -211,11 +213,10 @@ class wiki::collab::base {
} }
exec { "collab-copy-underlay": exec { "collab-copy-underlay":
user => collab, user => "root",
group => collab,
path => "/bin:/usr/bin:/sbin:/usr/sbin", path => "/bin:/usr/bin:/sbin:/usr/sbin",
cwd => "${wiki::moin::shared}/underlay", 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", creates => "/srv/wikis/collab/underlay/pages",
require => File["/srv/wikis/collab/underlay"], require => File["/srv/wikis/collab/underlay"],
} }