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

Fixed SELinux error from wiki module when no datadir is set.

Browse source
This commit is contained in:
Timo Mkinen 2012-07-12 21:10:14 +03:00
parent eb0e9417ee
commit e4168748a7
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wiki/manifests/init.pp
View file

@ -199,7 +199,7 @@ class wiki::collab::base {
} }
selinux::manage_fcontext { "/srv/wikis(/.*)?": selinux::manage_fcontext { "/srv/wikis(/.*)?":
type => "httpd_sys_rw_content_t", type => "httpd_sys_rw_content_t",
before => File[$wiki_datadir], before => File["/srv/wikis"],
} }
file { [ "/srv/wikis/collab", file { [ "/srv/wikis/collab",
@ -218,8 +218,12 @@ class wiki::collab::base {
owner => "collab", owner => "collab",
group => "collab", group => "collab",
seltype => "httpd_sys_rw_content_t", seltype => "httpd_sys_rw_content_t",
require => [ File["/srv/wikis"], User["collab"], Group["collab"], require => [
Class["wiki::moin", "wiki::collab"], ], File["/srv/wikis"],
User["collab"],
Group["collab"],
Class["wiki::moin", "wiki::collab"],
],
before => Exec["collab-create collab collab"], before => Exec["collab-create collab collab"],
} }