[Pkg-nagios-devel] nagios changelog,1.44,1.45 nagios-common.nagios.init,1.8,1.9 update-nagios,1.6,NONE update-nagios.8,1.3,NONE
seanius@haydn.debian.org
seanius@haydn.debian.org
Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv2621
Modified Files:
changelog nagios-common.nagios.init
Removed Files:
update-nagios update-nagios.8
Log Message:
two bug fixes, and removed the update-nagios cruft
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- changelog 8 Mar 2005 23:07:50 -0000 1.44
+++ changelog 15 Mar 2005 00:56:39 -0000 1.45
@@ -1,3 +1,14 @@
+nagios (2:1.3-cvs.20050116-5) unstable; urgency=low
+
+ * sean finney:
+ - check_started was broken for reloading nagios-pgsql and nagios-mysql.
+ thanks to Olleg Samoylov <olleg@mipt.ru> (closes: #299470).
+ - plugins would break in environments that use commas in their floating
+ points. as a workaround, set LC_NUMERIC=POSIX in the init script.
+ thanks again to Olleg Samoylov <olleg@mipt.ru> (closes: #299467).
+
+ -- sean finney <seanius@debian.org> Mon, 14 Mar 2005 19:41:52 -0500
+
nagios (2:1.3-cvs.20050116-4) unstable; urgency=medium
* Sean Finney:
Index: nagios-common.nagios.init
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.nagios.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- nagios-common.nagios.init 5 Mar 2005 18:48:20 -0000 1.8
+++ nagios-common.nagios.init 15 Mar 2005 00:56:39 -0000 1.9
@@ -1,16 +1,7 @@
#! /bin/sh
#
-# skeleton example file to build /etc/init.d/ scripts.
-# This file should be used to construct scripts for /etc/init.d.
-#
-# Written by Miquel van Smoorenburg <miquels@cistron.nl>.
-# Modified for Debian GNU/Linux
-# by Ian Murdock <imurdock@gnu.ai.mit.edu>.
-#
-# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl
+# init script for the nagios monitor
#
-# This file was automatically customized by dh-make on Mon, 17 Jan 2000 19:30:36 +0000
-# Hacked into netsaint shape by bjb.
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/nagios
@@ -23,19 +14,26 @@
test -f $DAEMON || exit 0
+# LC_NUMERIC must be set to POSIX for locales that use ',' in floating point
+# numbers, otherwise some plugins will break.
+export LC_NUMERIC
+LC_NUMERIC=POSIX
+
set -e
#
-# Is this function useful at all?
-# start-stop-daemon should handle this work!
+# check_started()
+#
+# checks not only for the pid (which could be done by start-stop-daemon),
+# but also for whether or not nagios is updating the status log (or database
+# in the case of nagios-mysql and nagios-pgsql)
#
check_started () {
if [ -f /etc/nagios/check_nagios_db ]; then
if ! /etc/nagios/check_nagios_db > /dev/null; then
return 1 # isn't started
fi
- fi
- if [ -f /usr/lib/nagios/plugins/check_nagios ]; then
+ elif [ -f /usr/lib/nagios/plugins/check_nagios ]; then
if ! /usr/lib/nagios/plugins/check_nagios -e 15 -F /var/log/nagios/status.log -C '/usr/sbin/nagios' > /dev/null; then
return 1 # isn't started
fi
--- update-nagios DELETED ---
--- update-nagios.8 DELETED ---