From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 25 Sep 2019 20:28:07 +0000 (+0200)
Subject: remove non-standard From header from Bacula emails
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=0aaf2b95a1b3dd600b64405a4721e0a10cfaee77

remove non-standard From header from Bacula emails

re Debian#935886, by anarcat
---

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index b2a209335..43a83233a 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -103,8 +103,8 @@ Catalog {
 ########################################################################
 Messages {
   Name = <%= @messages_name %>
-  mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"%r\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"%r\" -s \"Bacula: Intervention needed for %j\" %r"
 <% if @email_all %>
   mail = <%= @email_all %> = all
 <% end %>
@@ -121,7 +121,7 @@ Messages {
 # Message delivery for daemon messages (no job).
 Messages {
   Name = Daemon
-  mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
+  mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"%r\" -s \"Bacula daemon message\" %r"
   mail = <%= @email_daemon %> = all
   console = all, !skipped, !saved
   syslog = all