[Pkg-nagios-devel] nagios NEWS,1.3,1.4 nagios-common.postinst,1.9,1.10 update-nagios,1.5,1.6 update-nagios.8,1.2,1.3

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-serv18321

Modified Files:
	NEWS nagios-common.postinst update-nagios update-nagios.8 
Log Message:
various update-nagios related changes to document cfg_dir


Index: NEWS
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/NEWS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NEWS	13 Nov 2004 23:56:19 -0000	1.3
+++ NEWS	24 Feb 2005 01:50:39 -0000	1.4
@@ -1,3 +1,10 @@
+nagios (2:1.3-cvs.20050116-4) unstable; urgency=low
+
+  update-nagios is now deprecated, as nagios has this whole time
+  had support for reading directories full of cfg files.  d'oh!
+
+ -- sean finney <seanius@debian.org>  Wed, 23 Feb 2005 20:40:15 -0500
+
 nagios (2:1.2-4) unstable; urgency=medium
 
   Many paths changed in this package. You either need to change your

Index: nagios-common.postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.postinst,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- nagios-common.postinst	15 Feb 2005 22:17:38 -0000	1.9
+++ nagios-common.postinst	24 Feb 2005 01:50:39 -0000	1.10
@@ -206,9 +206,6 @@
      ln -s /usr/lib/nagios/plugins/check_netsaint check_nagios)
 fi
 
-# update the nagios plugins available, but don't freak out if it doesn't work
-/usr/sbin/update-nagios || true
-
 # Make sure the config file is readable by both nagios
 # and apache
 chown -R nagios:www-data /var/log/nagios /etc/nagios /var/run/nagios /var/cache/nagios

Index: update-nagios
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/update-nagios,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- update-nagios	15 Feb 2005 22:17:39 -0000	1.5
+++ update-nagios	24 Feb 2005 01:50:39 -0000	1.6
@@ -1,6 +1,20 @@
 #!/bin/sh
 #
 
+cat <<EOF >&2
+---------------------------------
+update-nagios is now no longer necessary!
+instead, set the following in nagios.cfg:
+
+cfg_dir=/etc/nagios-plugins/config
+
+and you will not have to re-run this program any
+more (just restart the nagios process).  this script
+will continue to work for now, but it will be 
+going away some day!
+---------------------------------
+EOF
+
 OUT=`tempfile`
 DEST=/var/cache/nagios/plugins-auto.cfg
 

Index: update-nagios.8
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/update-nagios.8,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- update-nagios.8	13 Nov 2004 23:56:20 -0000	1.2
+++ update-nagios.8	24 Feb 2005 01:50:39 -0000	1.3
@@ -8,25 +8,24 @@
 This small utility was written for the Debian GNU/Linux distribution and
 allows plugin packages to automatically register themselves with nagios 
 when installed.
-It also tells nagios to reload its config file unless the
--I "--no-reload"
-option is specified.
-Hopefully this utility will go away in the near future as a more elegant
-solution gets included upstream.
+This utility will be going away Real Soon Now, as nagios has support for
+reading configuration files from a directory.  The new default nagios
+configuration includes
+
+cfg_dir=/etc/nagios-plugins/config
+
+which should automatically reflect any configuration changes.
 
 .SH FILES
 /var/cache/nagios/plugins-auto.cfg \- auto-generated configuration file
 .br
 /etc/nagios-plugins/config/*.cfg \- config fragments provided by plugin packages
 
-.SH BUGS
-.PP
-This script shouldn't really be necessary and so is really a bug in itself :)
-
 .SH SEE ALSO
 nagios(8)
 
 .SH AUTHOR
 This manual page was written by Ben Bell <bjb@debian.org>,
-modified for Nagios by Turbo Fredriksson <turbo@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
+modified for Nagios by Turbo Fredriksson <turbo@debian.org>
+and Sean Finney <seanius@debian.org>, for the Debian GNU/Linux system
+(but may be used by others).