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:
Ossi Salmi 2012-11-16 19:40:31 +02:00
commit 98767cfb2a
45 changed files with 5517 additions and 156 deletions

View file

@ -70,7 +70,10 @@ class backuppc::server {
group => "root",
require => Package["BackupPC"],
}
selinux::manage_fcontext { "${backuppc_datadir}(/.*)?":
type => "var_lib_t",
before => File[$backuppc_datadir],
}
file { "/var/lib/BackupPC":
ensure => $backuppc_datadir,
force => true,