monitoring/NPalert/NPalert.spec | 6 +++++-
monitoring/NPalert/cron/notification | 2 +-
rel-eng/packages/NPalert | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 717028bd6873e18a99ff79a1344ec5cd48a6958f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 21 16:19:08 2011 +0200
Automatic commit of package [NPalert] release [1.126.24-1].
diff --git a/monitoring/NPalert/NPalert.spec b/monitoring/NPalert/NPalert.spec
index 6fcd4ef..70d389f 100644
--- a/monitoring/NPalert/NPalert.spec
+++ b/monitoring/NPalert/NPalert.spec
@@ -9,7 +9,7 @@ Name: NPalert
Summary: NOCpulse notification system
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.126.23
+Version: 1.126.24
Release: 1%{?dist}
BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
@@ -137,6 +137,10 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jul 21 2011 Miroslav Suchý 1.126.24-1
+- 723899 - run that cron task only if /etc/NOCpulse.ini contains something else
+ then comments
+
* Fri May 13 2011 Miroslav Suchý 1.126.23-1
- removing unmaintained file with dependencies
diff --git a/rel-eng/packages/NPalert b/rel-eng/packages/NPalert
index 4620fb0..fb9f07c 100644
--- a/rel-eng/packages/NPalert
+++ b/rel-eng/packages/NPalert
@@ -1 +1 @@
-1.126.23-1 monitoring/NPalert/
+1.126.24-1 monitoring/NPalert/
commit 0e8112055efe767a4d9caf794baef2c21db2ec80
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 21 16:17:43 2011 +0200
723899 - run that cron task only if /etc/NOCpulse.ini contains something else then
comments
diff --git a/monitoring/NPalert/cron/notification b/monitoring/NPalert/cron/notification
index 5e6efc4..8406dcf 100644
--- a/monitoring/NPalert/cron/notification
+++ b/monitoring/NPalert/cron/notification
@@ -1,2 +1,2 @@
# Check system load
-*/15 * * * * nocpulse if [ -e /etc/NOCpulse.ini ] ; then /usr/bin/monitor-queue ALERTS
50 100 2>&1 > /dev/null; fi
+*/15 * * * * nocpulse if [ -e /etc/NOCpulse.ini ] && grep -v '^#'
/etc/NOCpulse.ini >/dev/null; then /usr/bin/monitor-queue ALERTS 50 100 2>&1
> /dev/null; fi