[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-2-32-ge353040

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 024a68beecdcbe046525408632d098ee38a10e9b
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Wed Aug 8 13:56:07 2012 +0400

    fix incorrect logdir (#684203)

diff --git a/debian/changelog b/debian/changelog
index 01c2aa6..8446484 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ bacula (5.2.6+dfsg-3) unstable; urgency=high
     + switch from usermod to more debian-policy friendly adduser.
   * debian/*.postrm:
     + make package purging more carefull about users files.
+  * debian/patches/path-to-logdir.patch, debian/patches/series:
+    + fix bacula log directory (Closes: #684203).
 
   [ Bart Swedrowski ]
   * debian/bacula-console.postinst:
diff --git a/debian/patches/path-to-logdir.patch b/debian/patches/path-to-logdir.patch
new file mode 100644
index 0000000..600d24d
--- /dev/null
+++ b/debian/patches/path-to-logdir.patch
@@ -0,0 +1,49 @@
+Description: Fix path to logdir in config files, due to ignored --with-logdir
+ parameter.
+Bug-Debian: 684203
+Bug: http://bugs.bacula.org/view.php?id=1911
+Author: slaanesh
+Reviewed-by: Alexander Golovko <alexandro at ankalagon.ru>
+Last-Update: 2012-08-08
+
+diff -Naur bacula-5.2.10.old/scripts/logrotate.in bacula-5.2.10/scripts/logrotate.in
+--- bacula-5.2.10.old/scripts/logrotate.in	2012-07-16 10:28:18.315149487 +0200
++++ bacula-5.2.10/scripts/logrotate.in	2012-07-16 10:30:32.024248913 +0200
+@@ -6,7 +6,7 @@
+ #
+ #      /etc/logrotate.d/bacula
+ #
+- at working_dir@/log {
++ at logdir@/bacula.log {
+     monthly
+     rotate 5
+     notifempty
+diff -Naur bacula-5.2.10.old/scripts/logwatch/logfile.bacula.conf.in bacula-5.2.10/scripts/logwatch/logfile.bacula.conf.in
+--- bacula-5.2.10.old/scripts/logwatch/logfile.bacula.conf.in	2012-07-16 10:28:18.314149434 +0200
++++ bacula-5.2.10/scripts/logwatch/logfile.bacula.conf.in	2012-07-16 10:29:33.428805897 +0200
+@@ -1,3 +1,3 @@
+ # What actual file?  Defaults to LogPath if not absolute path....
+-LogFile = @working_dir@/log
++LogFile = @logdir@/bacula.log
+ 
+diff -Naur bacula-5.2.10.old/src/dird/bacula-dir.conf.in bacula-5.2.10/src/dird/bacula-dir.conf.in
+--- bacula-5.2.10.old/src/dird/bacula-dir.conf.in	2012-07-16 10:28:18.114138847 +0200
++++ bacula-5.2.10/src/dird/bacula-dir.conf.in	2012-07-16 10:28:33.508940427 +0200
+@@ -261,7 +261,7 @@
+ #          time to time as it will grow indefinitely. However, it will
+ #          also keep all your messages if they scroll off the console.
+ #
+-  append = "@working_dir@/log" = all, !skipped
++  append = "@logdir@/bacula.log" = all, !skipped
+   catalog = all
+ }
+ 
+@@ -273,7 +273,7 @@
+   mailcommand = "@sbindir@/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
++  append = "@logdir@/bacula.log" = all, !skipped
+ }
+ 
+ # Default pool definition
diff --git a/debian/patches/series b/debian/patches/series
index 59da68f..483ec27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ fix-scriptdir-examples-devices.patch
 add-systemd-bacula.conf-for-piddir.patch
 delegate-chuid-to-systemd.patch
 fix-systemd-daemon-user-group.patch
+path-to-logdir.patch

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