Merge tmakinen/puppet
Conflicts: dovecot/manifests/init.pp libvirt/manifests/init.pp munin/manifests/init.pp puppet/manifests/init.pp tftp/manifests/init.pp
This commit is contained in:
commit
98767cfb2a
45 changed files with 5517 additions and 156 deletions
|
@ -239,11 +239,11 @@ class munin::server {
|
|||
mode => "0775",
|
||||
owner => "munin",
|
||||
group => $apache::sslserver::group,
|
||||
seltype => "httpd_munin_content_t",
|
||||
seltype => "httpd_munin_rw_content_t",
|
||||
require => Package["munin"],
|
||||
}
|
||||
selinux::manage_fcontext { "/var/cache/munin":
|
||||
type => "munin_var_lib_t",
|
||||
selinux::manage_fcontext { "/var/cache/munin(/.*)?":
|
||||
type => "httpd_munin_rw_content_t",
|
||||
before => File["/var/cache/munin"],
|
||||
}
|
||||
mount { "/var/cache/munin":
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue