From c913812606b09f97c3657fb4324e716802f4beff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=E4kinen?= Date: Mon, 13 Feb 2012 12:26:27 +0200 Subject: [PATCH] Fixed SELinux contexts from BackupPC. --- backuppc/manifests/init.pp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/backuppc/manifests/init.pp b/backuppc/manifests/init.pp index 0e4bff4..130db9c 100644 --- a/backuppc/manifests/init.pp +++ b/backuppc/manifests/init.pp @@ -25,7 +25,7 @@ define backuppc::manualclient($ensure = "present", $operatingsystem = "default") mode => 0640, owner => root, group => backuppc, - seltype => "httpd_sys_script_rw_t", + seltype => "httpd_sys_rw_content_t", tag => "backuppc", require => File["/etc/BackupPC/pc"], notify => Exec["generate-backuppc-hosts"], @@ -105,11 +105,18 @@ class backuppc::server { require => Package["BackupPC"], } + if "${selinux}" == "true" { + selinux::manage_fcontext { "/etc/BackupPC(/.*)?": + type => "httpd_sys_rw_content_t", + } + } + file { "/etc/BackupPC/apache.users": ensure => present, mode => 0640, owner => "root", group => $apache::sslserver::group, + seltype => "httpd_sys_rw_content_t", require => Package["BackupPC"], } @@ -119,7 +126,7 @@ class backuppc::server { mode => 0440, owner => "backuppc", group => "backuppc", - seltype => "httpd_sys_script_rw_t", + seltype => "httpd_sys_rw_content_t", require => Package["BackupPC"], notify => Service["backuppc"], } @@ -131,7 +138,7 @@ class backuppc::server { mode => 0644, owner => "root", group => "backuppc", - seltype => "httpd_sys_script_rw_t", + seltype => "httpd_sys_rw_content_t", require => Package["BackupPC"], notify => Exec["generate-backuppc-hosts"], } @@ -144,7 +151,7 @@ class backuppc::server { mode => 0640, owner => "root", group => "backuppc", - seltype => "httpd_sys_script_rw_t", + seltype => "httpd_sys_rw_content_t", source => "puppet:///modules/custom/empty", require => Package["BackupPC"], notify => Exec["generate-backuppc-hosts"],