From 9ae45e3fef24617254cc2991a5463b43c9ad5865 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Fri, 21 Nov 2014 10:54:27 +0200
Subject: [PATCH] bacula: Sync SELinux contexts with CentOS 6.6 and change mail
 command to use bacula's own bsmtp to prevent SELinux errors.

---
 bacula/manifests/init.pp             | 8 ++++----
 bacula/templates/bacula-dir.conf.erb | 4 ++--
 bacula/templates/bacula-sd.conf.erb  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bacula/manifests/init.pp b/bacula/manifests/init.pp
index 7265230..efc83fe 100644
--- a/bacula/manifests/init.pp
+++ b/bacula/manifests/init.pp
@@ -215,11 +215,11 @@ class bacula::director($password=undef,
         mode    => "0770",
         owner   => "bacula",
         group   => "bacula",
-        seltype => "var_spool_t",
+        seltype => "bacula_spool_t",
         require => Package["bacula-director"],
     }
     selinux::manage_fcontext { "${datadir}(/.*)?":
-        type   => "var_spool_t",
+        type   => "bacula_spool_t",
         before => File[$datadir],
     }
     if $datadir != "/srv/bacula" {
@@ -228,11 +228,11 @@ class bacula::director($password=undef,
             target  => $datadir,
             owner   => "bacula",
             group   => "bacula",
-            seltype => "var_spool_t",
+            seltype => "bacula_spool_t",
             require => File[$datadir],
         }
         selinux::manage_fcontext { "/srv/bacula(/.*)?":
-            type   => "var_spool_t",
+            type   => "bacula_spool_t",
             before => File[$datadir],
         }
     }
diff --git a/bacula/templates/bacula-dir.conf.erb b/bacula/templates/bacula-dir.conf.erb
index 382e776..9a93566 100644
--- a/bacula/templates/bacula-dir.conf.erb
+++ b/bacula/templates/bacula-dir.conf.erb
@@ -15,8 +15,8 @@ Director {
 
 Messages {
     Name = "Standard"
-    MailCommand = "mail -s \"Bacula Message\" %r"
-    OperatorCommand = "mail -s \"Bacula Operator Message\" %r"
+    MailCommand = "bsmtp -h <%= @mail_server %> -s \"Bacula Message\" %r"
+    OperatorCommand = "bsmtp -h <%= @mail_server %> -s \"Bacula Operator Message\" %r"
     mail = root = all, !skipped
     operator = root = mount
     append = "/var/log/bacula/bacula.log" = all, !skipped
diff --git a/bacula/templates/bacula-sd.conf.erb b/bacula/templates/bacula-sd.conf.erb
index e9ea737..e785dfc 100644
--- a/bacula/templates/bacula-sd.conf.erb
+++ b/bacula/templates/bacula-sd.conf.erb
@@ -24,8 +24,8 @@ Director {
 
 Messages {
     Name = "Standard"
-    MailCommand = "mail -s \"Bacula Message\" %r"
-    OperatorCommand = "mail -s \"Bacula Operator Message\" %r"
+    MailCommand = "bsmtp -h <%= @mail_server %> -s \"Bacula Message\" %r"
+    OperatorCommand = "bsmtp -h <%= @mail_server %> -s \"Bacula Operator Message\" %r"
     mail = root = all, !skipped, !info
     operator = root = mount
     director = bacula-dir = all