logrotate fixes

– rotate the log configured in the default config file
  (/var/log/bacula/log)
- archive to /var/log/archive/bacula

Release: /var/log/archive/bacula

diff --git a/bacula.logrotate b/bacula.logrotate
index 65baed96133199aa10d2977d264d57d1abba09f3..0f6125f768f70f9519d770408bbb7bca6dbe5e81 100644 (file)
--- a/bacula.logrotate
+++ b/bacula.logrotate
@@ -1,12 +1,5 @@
-#
-# If you are appending to a log file (default), to
-#   have your log file compressed, rotated, and after a time
-#   deleted, after possibly editing the values below,    
-#   copy this file to:
-#
-#      /etc/logrotate.d/bacula
-#
-/var/lib/bacula/log {
+/var/log/bacula/log {
+       olddir /var/log/archive/bacula
        su root bacula
        monthly
        rotate 5

diff --git a/bacula.spec b/bacula.spec
index 6b740f6d0623009613d488b3c8eadb3358b74aab..f5ec1f5fb12c85887a54e78cd4a678d541f7088f 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -32,7 +32,7 @@ Summary:      Bacula - The Network Backup Solution
 Summary(pl.UTF-8):     Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:          bacula
 Version:       5.2.13
-Release:       1
+Release:       2
 License:       AGPL v3
 Group:         Networking/Utilities
 Source0:       http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
@@ -543,7 +543,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,pam.d,sysconfig} \
                $RPM_BUILD_ROOT%{_sysconfdir}/rescue \
                $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
-               $RPM_BUILD_ROOT{%{_mandir},%{_bindir},/var/log/bacula} \
+               $RPM_BUILD_ROOT{%{_mandir},%{_bindir},/var/log{,/archive}/bacula} \
                $RPM_BUILD_ROOT%{systemdunitdir}
 
 %{__make} install \
@@ -839,6 +839,7 @@ ln -sf libbaccats-%{1}-%{version}.so %{_libdir}/libbaccats-%{version}.so || : \
 %attr(770,root,bacula) %dir %{_localstatedir}
 %attr(750,bacula,logs) %dir /var/log/bacula
 %attr(640,bacula,logs) %ghost /var/log/bacula/log
+%attr(750,bacula,logs) %dir /var/log/archive/bacula
 
 %files dir
 %defattr(644,root,root,755)