tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed dependencies in wiki::collab::base

Browse source
This commit is contained in:
Ossi Salmi 2012-04-20 15:47:10 +03:00
parent 39a5aa9924
commit 89a7f87ef7
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
wiki/files/collab-httpd.conf
View file

@ -2,3 +2,6 @@
Options +ExecCGI
AllowOverride All
</Directory>
<Directory "/srv/www/https/*/moin_static">
AllowOverride FileInfo
</Directory>

15
wiki/manifests/init.pp
View file

@ -208,8 +208,8 @@ class wiki::collab::base {
owner => "collab",
group => "collab",
require => [ File["/srv/wikis"], User["collab"], Group["collab"],
Python::Setup::Install["/usr/local/src/graphingwiki/collab"],
Python::Setup::Install["/usr/local/src/moin"], ],
Class["wiki::moin", "wiki::collab"], ],
before => Exec["collab-create collab collab"],
}
exec { "collab-copy-underlay":
@ -219,6 +219,7 @@ class wiki::collab::base {
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"],
before => Exec["collab-create collab collab"],
}
file { "/srv/wikis/collab/config/collabfarm.py":
@ -231,6 +232,7 @@ class wiki::collab::base {
"/usr/local/src/graphingwiki/collab/config/collabfarm.py", ],
replace => false,
require => File["/srv/wikis/collab/config"],
before => Exec["collab-create collab collab"],
}
file { "/srv/wikis/collab/config/intermap.txt":
@ -241,6 +243,7 @@ class wiki::collab::base {
source => "/usr/local/src/graphingwiki/collab/config/intermap.txt",
replace => false,
require => File["/srv/wikis/collab/config"],
before => Exec["collab-create collab collab"],
}
file { "/srv/wikis/collab/config/logging.conf":
@ -251,6 +254,7 @@ class wiki::collab::base {
source => "/usr/local/src/graphingwiki/collab/config/logging.conf",
replace => false,
require => File["/srv/wikis/collab/config"],
before => Exec["collab-create collab collab"],
}
file { "/srv/wikis/collab/htdocs/.htaccess":
@ -261,6 +265,7 @@ class wiki::collab::base {
source => "puppet:///modules/wiki/htaccess",
replace => false,
require => File["/srv/wikis/collab/htdocs"],
before => Exec["collab-create collab collab"],
}
file { [ "/etc/local", "/etc/local/collab" ]:
@ -281,6 +286,7 @@ class wiki::collab::base {
group => "root",
content => template("wiki/collab.ini.erb"),
require => File["/etc/local/collab"],
before => Exec["collab-create collab collab"],
}
if !$wiki_collab_fqdn {
@ -298,11 +304,6 @@ class wiki::collab::base {
user => "collab",
group => "collab",
creates => "/srv/wikis/collab/wikis/collab",
require => [ File["/etc/local/collab/collab.ini"],
Class["wiki::collab"],
File["/srv/wikis/collab/wikis"],
File["/srv/wikis/collab/htdocs/.htaccess"],
Exec["collab-copy-underlay"], ],
}
exec { "collab-account-create -f -r collab":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",