From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 18 Jan 2010 12:53:20 +0000 (+0100)
Subject: Fix logwatch install in bacula.spec. Patch from bug #1454
X-Git-Tag: Release-5.0.0~65
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0190d10164ac08f86c03911fd47e705ff419d509;p=bacula%2Fbacula

Fix logwatch install in bacula.spec. Patch from bug #1454
---

diff --git a/bacula/platforms/redhat/bacula.spec b/bacula/platforms/redhat/bacula.spec
index 7cf6f9bfaa..2d98d7fd72 100644
--- a/bacula/platforms/redhat/bacula.spec
+++ b/bacula/platforms/redhat/bacula.spec
@@ -841,6 +841,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/logwatch/conf/logfiles
 mkdir -p $RPM_BUILD_ROOT/etc/logwatch/conf/services
 mkdir -p $RPM_BUILD_ROOT/etc/logwatch/scripts/services
+mkdir -p $RPM_BUILD_ROOT/etc/logwatch/scripts/shared
 mkdir -p $RPM_BUILD_ROOT%{script_dir}/updatedb
 
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
@@ -911,9 +912,11 @@ cp -p updatedb/* $RPM_BUILD_ROOT%{script_dir}/updatedb/
 # install the logwatch scripts
 %if ! %{client_only}
 cp -p scripts/logwatch/bacula $RPM_BUILD_ROOT/etc/logwatch/scripts/services/bacula
+cp -p scripts/logwatch/applybacula $RPM_BUILD_ROOT/etc/logwatch/scripts/shared/applybacula
 cp -p scripts/logwatch/logfile.bacula.conf $RPM_BUILD_ROOT/etc/logwatch/conf/logfiles/bacula.conf
 cp -p scripts/logwatch/services.bacula.conf $RPM_BUILD_ROOT/etc/logwatch/conf/services/bacula.conf
 chmod 755 $RPM_BUILD_ROOT/etc/logwatch/scripts/services/bacula
+chmod 755 $RPM_BUILD_ROOT/etc/logwatch/scripts/shared/applybacula
 chmod 644 $RPM_BUILD_ROOT/etc/logwatch/conf/logfiles/bacula.conf
 chmod 644 $RPM_BUILD_ROOT/etc/logwatch/conf/services/bacula.conf
 %endif
@@ -1028,6 +1031,7 @@ rm -f $RPM_BUILD_DIR/Release_Notes-%{version}-%{release}.txt
 
 /etc/logrotate.d/bacula
 /etc/logwatch/scripts/services/bacula
+/etc/logwatch/scripts/shared/applybacula
 %attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bacula-dir.conf
 %attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bacula-fd.conf
 %attr(-, root, %{storage_daemon_group}) %config(noreplace) %{sysconf_dir}/bacula-sd.conf
diff --git a/bacula/scripts/logwatch/README b/bacula/scripts/logwatch/README
index b3b8617fea..96f68b3ba1 100644
--- a/bacula/scripts/logwatch/README
+++ b/bacula/scripts/logwatch/README
@@ -7,7 +7,7 @@ straightforward. Run 'make install' as root from this directory.
 For manual install copy the files as indicated below:
 
 cp -p scripts/logwatch/bacula /etc/log.d/scripts/services/bacula
-cp -p scripts/logwatch/bacula /etc/log.d/scripts/shared/applybaculadate
+cp -p scripts/logwatch/applybacula /etc/log.d/scripts/shared/applybaculadate
 cp -p scripts/logwatch/logfile.bacula.conf /etc/log.d/conf/logfiles/bacula.conf
 cp -p scripts/logwatch/services.bacula.conf /etc/log.d/conf/services/bacula.conf
 chmod 755 /etc/log.d/scripts/services/bacula
@@ -41,4 +41,3 @@ Jobs Run:
 
 
  ---------------------- bacula End ------------------------- 
-