Small log changes

This commit is contained in:
Simone Caronni 2011-12-07 18:02:25 +01:00
parent 9e56892319
commit b43f21246b
3 changed files with 26 additions and 3 deletions

View File

@ -0,0 +1,21 @@
diff -Naur bacula-5.2.2.old/src/dird/bacula-dir.conf.in bacula-5.2.2/src/dird/bacula-dir.conf.in
--- bacula-5.2.2.old/src/dird/bacula-dir.conf.in 2011-12-05 14:14:52.730892121 +0100
+++ bacula-5.2.2/src/dird/bacula-dir.conf.in 2011-12-07 16:55:16.391276283 +0100
@@ -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

View File

@ -1,6 +1,6 @@
# Bacula logrotate script
/var/log/bacula/*.log /var/spool/bacula/log /var/log/bacula/bacula.log {
/var/log/bacula/*.log /var/spool/bacula/log {
monthly
rotate 4
notifempty

View File

@ -25,7 +25,7 @@ Source18: bacula-checkconf
Patch1: bacula-5.2.2-config.patch
Patch2: bacula-5.0.2-openssl.patch
Patch3: bacula-5.2.2-queryfile.patch
Patch5: bacula-5.0.3-log-path.patch
Patch5: bacula-5.2.2-log-path.patch
Patch6: bacula-5.0.3-sqlite-priv.patch
Patch7: bacula-5.2.1-bat-pamd.patch
Patch8: bacula-5.2.2-qt-console-optflags.patch
@ -296,7 +296,7 @@ Provides check_bacula support for Nagios.
%patch1 -p1 -b .config
%patch2 -p2 -b .openssl
%patch3 -p1 -b .queryfile
%patch5 -p2 -b .log-path
%patch5 -p1 -b .log-path
%patch6 -p0 -b .priv
%patch7 -p1 -b .bat-pamd
%patch8 -p1 -b .optflags
@ -331,6 +331,7 @@ export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
--with-mon-fd-password=@@MON_FD_PASSWORD@@ \
--with-mon-sd-password=@@MON_SD_PASSWORD@@ \
--with-working-dir=%{_localstatedir}/spool/bacula \
--with-bsrdir=%{_localstatedir}/spool/bacula \
--with-logdir=%{_localstatedir}/log/bacula \
--with-scriptdir=%{_libexecdir}/bacula \
--with-plugindir=%{_libdir}/bacula \
@ -843,6 +844,7 @@ fi
%changelog
* Wed Dec 07 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-9
- Add sample-query.sql as config file.
- Small log changes.
* Wed Dec 07 2011 Simone Caronni <negativo17@gmail.com> - 5.2.2-8
- Fixed building on RHEL/CentOS 4.