[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-135-g98b3c29

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 98b3c297418bc573d587725ec35eea904e0aec22
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Fri Jun 1 20:53:48 2012 +0400

    Remove from fix-default-config bsmtp path changing
    
    There is no need to change bsmtp path in default configs due to changing bsmtp path

diff --git a/debian/patches/fix-default-config b/debian/patches/fix-default-config
index 407a299..53eca14 100644
--- a/debian/patches/fix-default-config
+++ b/debian/patches/fix-default-config
@@ -64,26 +64,6 @@ Last-Update: 2012-06-01
  #  Address = @hostname at 2
  #  FDPort = @fd_port@
  #  Catalog = MyCatalog
-@@ -251,8 +252,8 @@
- #  tell (most) people that its coming from an automated source.
- 
- #
--  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: %t %e of %c %l\" %r"
--  operatorcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: Intervention needed for %j\" %r"
-+  mailcommand = "/usr/lib/bacula/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: %t %e of %c %l\" %r"
-+  operatorcommand = "/usr/lib/bacula/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: Intervention needed for %j\" %r"
-   mail = @job_email@ = all, !skipped            
-   operator = @job_email@ = mount
-   console = all, !skipped, !saved
-@@ -270,7 +271,7 @@
- # Message delivery for daemon messages (no job).
- Messages {
-   Name = Daemon
--  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r"
-+  mailcommand = "/usr/lib/bacula/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r"
-   mail = @job_email@ = all, !skipped            
-   console = all, !skipped, !saved
-   append = "@working_dir@/log" = all, !skipped
 @@ -307,7 +308,7 @@
  # Restricted console used by tray-monitor to get the status of the director
  #
@@ -182,11 +162,6 @@ Last-Update: 2012-06-01
  }
  
  #
-#--- /dev/null
-#+++ b/scripts/logwatch/logfile.bacula.conf.in
-#@@ -0,0 +1,2 @@
-#+# What actual file?  Defaults to LogPath if not absolute path....
-#+LogFile = /var/lib/bacula/log
 --- a/src/console/bconsole.conf.in
 +++ b/src/console/bconsole.conf.in
 @@ -3,7 +3,7 @@

-- 
Bacula, a network backup, recovery and verification program