From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 7 Sep 2012 13:28:19 +0000 (+0200)
Subject: Apply patch from bug #1911 to implement --with-logdir
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=68ef08e25e1f23e6639d64a3e596fe07f32193f0;p=bacula%2Fbacula

Apply patch from bug #1911 to implement --with-logdir
---

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 5f46fc30b8..157440414e 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -1316,7 +1316,7 @@ AC_SUBST(bsrdir)
 dnl ------------------------------------------
 dnl Where to place logdir (bsr files)
 dnl ------------------------------------------
-logdir=/tmp
+logdir=`eval echo ${prefix}/var/bacula/working`
 AC_ARG_WITH(logdir,
    AC_HELP_STRING([--with-logdir=PATH], [specify path of Bacula logs directory]),
    [
diff --git a/bacula/scripts/logrotate.in b/bacula/scripts/logrotate.in
index a390d86591..0b1304c6ad 100644
--- a/bacula/scripts/logrotate.in
+++ b/bacula/scripts/logrotate.in
@@ -6,7 +6,7 @@
 #
 #      /etc/logrotate.d/bacula
 #
-@working_dir@/log {
+@logdir@/bacula.log {
     monthly
     rotate 5
     notifempty
diff --git a/bacula/scripts/logwatch/logfile.bacula.conf.in b/bacula/scripts/logwatch/logfile.bacula.conf.in
index 3eaf0e2c75..22b6e985db 100644
--- a/bacula/scripts/logwatch/logfile.bacula.conf.in
+++ b/bacula/scripts/logwatch/logfile.bacula.conf.in
@@ -1,3 +1,3 @@
 # What actual file?  Defaults to LogPath if not absolute path....
-LogFile = @working_dir@/log
+LogFile = @logdir@/bacula.log
 
diff --git a/bacula/src/dird/bacula-dir.conf.in b/bacula/src/dird/bacula-dir.conf.in
index 5793ea1ff5..9b79d468c0 100644
--- a/bacula/src/dird/bacula-dir.conf.in
+++ b/bacula/src/dird/bacula-dir.conf.in
@@ -261,7 +261,7 @@ Messages {
 #          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 @@ Messages {
   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