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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 5f46fc30b8e256a0936b8f6ae6ca4ffe9840f3ec..157440414efe351e59557dffaff3e1a1ca36de3b 100644 (file)
--- 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 a390d86591bb7bbdae1a83f41cd08526b32f0e9f..0b1304c6adf69b3ab7fc937dbf3f0f64e8e5a976 100644 (file)
--- 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 3eaf0e2c7555daf3acd12a179f8beb4068196f4e..22b6e985db79441dd78137fd1483b91b474c6e64 100644 (file)
--- 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 5793ea1ff52cee7a48de338e46f62bb96d21b6fb..9b79d468c0d18cc91cf0d80705dbe7d211772b78 100644 (file)
--- 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