[Pkg-nagios-devel] nagios checkcommands.cfg,NONE,1.1 nagios-common.templates,NONE,1.1 NEWS,1.2,1.3 README.Debian,1.2,1.3 README.mysql,1.1.1.1,1.2 changelog,1.10,1.11 check_nagios_db,1.1,1.2 control,1.6,1.7 nagios-common.examples,1.1,1.2 nagios-common.init.d,1.2,1.3 nagios-common.install,1.3,1.4 nagios-common.postinst,1.2,1.3 nagios-common.postrm,1.1,1.2 rules,1.9,1.10 update-nagios,1.1.1.1,1.2 update-nagios.8,1.1.1.1,1.2 README.databases,1.1.1.1,NONE command.cfg,1.1.1.1,NONE templates,1.2,NONE

joerg@haydn.debian.org joerg@haydn.debian.org


Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/tmp/cvs-serv5217

Modified Files:
	NEWS README.Debian README.mysql changelog check_nagios_db 
	control nagios-common.examples nagios-common.init.d 
	nagios-common.install nagios-common.postinst 
	nagios-common.postrm rules update-nagios update-nagios.8 
Added Files:
	checkcommands.cfg nagios-common.templates 
Removed Files:
	README.databases command.cfg templates 
Log Message:
Moved templates to nagios-common.templates, deleted unused README.databases and
command.cfg, as well as some unused patches.
Modified a lot to make upgrades working, mark more bugs as closed with this
release.
Updated the debconf translations, some of them are still fuzzy, im waiting for
the translators to sent me an updated version.

Now: This works for me, tested with upgrades from the actual sid/sarge version
to this one, tested with fresh installs. I consider this as a version I can upload,
so if you have anything to add: Do it NOW! :)



--- NEW FILE: checkcommands.cfg ---
# checkcommands.cfg - Nagios configuration file for local user changes
#
# Nagios packages wont touch this file anymore. If you want to define
# your own commands for nagios use this file and add the commands here.
# Dont add any command with a name that already exists or nagios wont
# run.

--- NEW FILE: nagios-common.templates ---
Template: nagios/configapache
Type: select
_Choices: Apache, Apache2, Apache-SSL, Both, None
Default: ${webserver}
_Description: Automatically configure apache for Nagios?
 Nagios requires a few things to be set up in your web server configuration
 in order for the front end to function properly.
 .
 The Debian packaged version can usually automatically configure apache by
 dropping a symlink into the /etc/APACHE-SERVER/conf.d directory.
 Would you like me to do this? Say no if you aren't running apache or
 you would prefer to set up the web server yourself. If you say yes
 here, all configuration changes will also be removed when the packages
 is purged. Do not edit the configuration by hand, but instead make a
 copy of it, and remove the trailing header and footer, as everything
 between them will be automatically updated on package updates.
 .
 Since there is no special Apache2-SSL, 'both' means Apache and Apache-SSL.

Template: nagios/adminpassword
Type: password
_Description: Nagios web administration password?
 By default, Nagios's web administration requires visitors to log in before
 they can access anything. Different users may view different hosts and
 some may send commands to the Nagios backend.
 .
 As you are using the default apache configuration, I have set up a default
 administration user of "nagiosadmin". Please enter a password for this
 account. Additional users may be added to the file
 /etc/nagios/htpasswd.users using the htpasswd utility supplied with
 apache. If you have changed the password, and don't want to re-enter one,
 just press Enter here, and the password will be left alone.
 .
 The user you're about to set a password for is 'nagiosadmin', and the
 default configuration distributed with the package allow that user to view
 and change anything in Nagios. You're free (and encouraged) to configure
 your own users with their own access views.

Template: nagios/wwwsuid
Type: boolean
Default: true
_Description: Enable Nagios external command interface on web??
 Nagios can be configured to listen for "external commands" from processes
 to alter service check parameters and other settings on the fly. The Web
 interface uses this to allow users to restart the server, schedule checks
 and so on.
 .
 In order for this to work, Nagios CGI scripts have to be able to write to
 the file /var/run/nagios/nagios.cmd. The Debian packaged version can
 support this by running setuid to the Nagios user.

Template: nagios/upgradefromnetsaint
Type: note
_Description: Upgrading from Netsaint
 I see that you've been running Netsaint (at least there's a Netsaint
 configuration). Nagios is Netsaint with another name (and quite a big
 change in code base) using a different type of configuration. To migrate
 the Netsaint configuration to Nagios format, please execute the command
 /usr/sbin/upgrade-netsaint2nagios.

Index: NEWS
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NEWS	31 Oct 2004 14:52:44 -0000	1.2
+++ NEWS	13 Nov 2004 23:56:19 -0000	1.3
@@ -1,13 +1,27 @@
 nagios (2:1.2-4) unstable; urgency=medium
 
-  The command fifo moved to a FHS compliant location. It is now in 
-  /var/run/nagios/nagios.cmd and you need to update your scripts/tools
-  if you use the fifo. For a quick solution you may simply add a symlink
-  to the new location.
-  If you dont allow dpkg to overwrite the init file you need to change
-  the location there too!
+  Many paths changed in this package. You either need to change your
+  config for it or let dpkg replace it with the new one.
+  The following changes should be done:
+  command_file         -> /var/run/nagios/nagios.cmd
+  temp_file            -> /var/cache/nagios/nagios.tmp
+  state_retention_file -> /var/cache/nagios/status.sav
 
- -- Joerg Jaspert <joerg@debian.org>  Sun, 31 Oct 2004 14:19:01 +0100
+  If you use external scripts/tools to submit commands to nagios through
+  the command fifo you need to update these tools or they stop working.
+  If thats to hard - create a symlink as an intermediate solution.
+
+  Plugin configuration changed. In the past update-nagios wrote to the
+  file /etc/nagios/checkcommands.cfg - which is not a good location for
+  autogenerated files. Now it writes to /var/cache/nagios/plugins-auto.cfg
+  and doesnt touch /etc anymore. If you use it - you need to update your
+  config for the new location.
+
+  If you use one of the two SQL versions of nagios please read
+  README.Debian how to get proper support for the database in the CGI
+  and startup script (its easy).
+
+ -- Joerg Jaspert <joerg@debian.org>  Sat, 13 Nov 2004 21:59:58 +0100
 
 nagios (2:1.2-3.6) unstable; urgency=medium
 

Index: README.Debian
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/README.Debian,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- README.Debian	11 Nov 2004 00:01:49 -0000	1.2
+++ README.Debian	13 Nov 2004 23:56:19 -0000	1.3
@@ -53,20 +53,20 @@
 
 	CONFIGURE=./configure --prefix=/usr \
         	--mandir=/usr/share/man \
-		--with-nagios-user=nagios \
+			--with-nagios-user=nagios \
 	        --with-nagios-grp=nagios \
-		--bindir=/usr/sbin \
+			--bindir=/usr/sbin \
 	        --sbindir=/usr/lib/cgi-bin/nagios \
-		--datadir=/usr/share/nagios/htdocs \
+			--datadir=/usr/share/nagios/htdocs \
 	        --libexecdir=/usr/lib/nagios/plugins \
-		--sysconfdir=/etc/nagios \
+			--sysconfdir=/etc/nagios \
 	        --mandir=/usr/share/man \
-		--infodir=/usr/share/info \
+			--infodir=/usr/share/info \
 	        --localstatedir=/var/log/nagios \
-		--with-ping-command="/bin/ping -n %s -c %d" \
+			--with-ping-command="/bin/ping -n %s -c %d" \
 	        --with-template-extinfo \
-		--with-template-objects \
-		--with-perlcache
+			--with-template-objects \
+			--with-perlcache
 
 To compile the two SQL enabled Nagios packages, I added the follwoing.
 For the PostgreSQL enabled package:

Index: README.mysql
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/README.mysql,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- README.mysql	31 Oct 2004 09:59:28 -0000	1.1.1.1
+++ README.mysql	13 Nov 2004 23:56:19 -0000	1.2
@@ -41,7 +41,9 @@
 If you get 'ERROR 1045: Access denied for user' etc, then specify the
 MySQL root password as first parameter.
 
-Next you need to edit two files.
+Next you need to edit two files. If you put any passwords in the files -
+be sure to make them NOT world readable by issuing something like
+chmod o= /etc/nagios/resource.cfg.
 
 1) /etc/nagios/resource.cfg
 

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- changelog	11 Nov 2004 00:01:50 -0000	1.10
+++ changelog	13 Nov 2004 23:56:19 -0000	1.11
@@ -37,6 +37,11 @@
     - We now dont check with ps and some greps for apache to reload it anymore. We
       simply issue a reload as this reloads config but doesnt restart server if it
       is not running.
+    - update-nagios no longer creates /etc/nagios/checkcommands.cfg. It now creates
+      /var/cache/nagios/plugins-auto.cfg which is a better location for this file.
+      This (Closes: #236324, 266864)
+    - We now deliver a small checkcommands.cfg, including a small header telling the
+      user that he can use this file for his own commands now.
     - Bug fix: "default nagios.cfg doesn't use new /var/cache paths", thanks
       to Peter Palfrader (Closes: #276349).
     - Bug fix: "wrong status.log path in init script", thanks to jan gregor
@@ -47,9 +52,9 @@
     - Bug fix: "nagios-text: nagiosadmin user had to be in contact configs,
       else cgi acess denied", thanks to Alban Browaeys (Closes: #274179).
     - Bug fix: "nagios-mysql: Cgi and init.d script can't read status info",
-      thanks to Ryszard Lach (Closes: #246372). Read README.Debian.
+      thanks to Ryszard Lach (Closes: #246372, 211169). Read README.Debian.
       Added: check_nagios_db
-    - Alos fixes: "nagios-pgsql /etc/init.d/nagios script reload function is
+    - Also fixes: "nagios-pgsql /etc/init.d/nagios script reload function is
       broken", thanks to Philippe Lafoucrière (Closes: #272883).
     - Bug fix: "init script does not work with a clean environment", thanks
       to Peter Palfrader (Closes: #276421).
@@ -57,6 +62,23 @@
       httpd.conf. Better use /etc/apache/conf.d", thanks to txemi (Closes: #273235).
     - Bug fix: "nagios-text: typo in configure-script", thanks to Raoul
       Borenius (Closes: #269568).
+    - Bug fix: "Errors in English of po-debconf://nagios", thanks to Matt
+      Bonner (Closes: #246085).
+    - Bug fix: "nagios: Please add German translation of the debconf
+      templates", thanks to Erik Schanze (Closes: #280161).
+    - Bug fix: "missing examples in /usr/share/doc/nagios-text/examples",
+      thanks to job bogan (Closes: #258455).
+    - Bug fix: "nagios-pgsql: icon not coming up in statusmap", thanks to
+      Tommy Tsui (Closes: #235400).
+    - Bug fix: "nagios-text: Config file error", thanks to Karel Bemelmans
+      (Closes: #238877).
+    - Bug fix: "nagios-text: Extended host data broken", thanks to Paul
+      Tietjens (Closes: #239174).
+    - Bug fix: "performance data handling broken", thanks to Gebhardt Thomas
+      (Closes: #257289).
+    - Bug fix: "nagios-mysql: README.mysql should not guide users into
+      giving all mysql-passwords away", thanks to Jeroen van Wolffelaar
+      (Closes: #267827).
   * Sean Finney:
     - added danish and catalan debconf translations.  thanks go to 
       Claus Hindsgaul and Aleix Badia i Bosch respectively.  
@@ -64,7 +86,7 @@
     - adduser and debconf are now normal dependencies
     - added fix in init script for non-existant pidfile
 
- -- Joerg Jaspert <joerg@debian.org>  Thu, 11 Nov 2004 00:42:03 +0100
+ -- Joerg Jaspert <joerg@debian.org>  Sun, 14 Nov 2004 00:52:56 +0100
 
 nagios (2:1.2-3.6) unstable; urgency=high
 

Index: check_nagios_db
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/check_nagios_db,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- check_nagios_db	11 Nov 2004 00:01:50 -0000	1.1
+++ check_nagios_db	13 Nov 2004 23:56:19 -0000	1.2
@@ -10,6 +10,7 @@
 use Getopt::Std;
 use DBI;
 
+# Change this to Pg if you use postgresql.
 my $driver = "mysql";
 
 my $CFG_DEF = "/etc/nagios/cgi.cfg";

Index: control
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/control,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- control	9 Nov 2004 23:30:07 -0000	1.6
+++ control	13 Nov 2004 23:56:19 -0000	1.7
@@ -8,7 +8,7 @@
 
 Package: nagios-common
 Architecture: all
-Depends: nagios, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, mailx, nagios-plugins (>= 1.3.1.0-6), adduser, debconf
+Depends: nagios, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, mailx, nagios-plugins (>= 1.3.1.0-6), adduser, ${misc:Depends}
 Conflicts: nagios-text (<= 2:1.2-3.6), nagios-mysql (<= 2:1.2-3.6), nagios-pgsql (<= 2:1.2-3.6)
 Replaces: netsaint, nagios
 Description: A host/service/network monitoring and management system

Index: nagios-common.examples
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.examples,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-common.examples	9 Nov 2004 23:30:07 -0000	1.1
+++ nagios-common.examples	13 Nov 2004 23:56:20 -0000	1.2
@@ -1,3 +1 @@
-sample-config/nagios.cfg
-sample-config/resource.cfg
-sample-config/template-object/hosts.cfg
+sample-config/*

Index: nagios-common.init.d
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.init.d,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nagios-common.init.d	11 Nov 2004 00:01:50 -0000	1.2
+++ nagios-common.init.d	13 Nov 2004 23:56:20 -0000	1.3
@@ -37,13 +37,13 @@
  	    return 1    # Isn't started
  	fi
     elif [ -f /usr/lib/nagios/plugins/check_nagios ]; then
-	if /usr/lib/nagios/plugins/check_nagios -F /var/cache/nagios/status.log -e 5 -C 'nagios' > /dev/null; then
+	if /usr/lib/nagios/plugins/check_nagios -F /var/log/nagios/status.log -e 5 -C 'nagios' > /dev/null; then
 	    return 0    # Is started
 	else
 	    return 1    # Isn't started
 	fi
     elif [ -f /usr/lib/netsaint/plugins/check_netsaint ]; then
-	if /usr/lib/netsaint/plugins/check_netsaint -F /var/cache/nagios/status.log -e 5 -C 'nagios' > /dev/null; then
+	if /usr/lib/netsaint/plugins/check_netsaint -F /var/log/nagios/status.log -e 5 -C 'nagios' > /dev/null; then
 	    return 0    # Is started
 	else
 	    return 1    # Isn't started

Index: nagios-common.install
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.install,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- nagios-common.install	11 Nov 2004 00:01:50 -0000	1.3
+++ nagios-common.install	13 Nov 2004 23:56:20 -0000	1.4
@@ -9,9 +9,9 @@
 html/docs/images/* usr/share/nagios/htdocs/docs/images
 html/images/*.gif html/images/*.jpg html/images/*.png usr/share/nagios/htdocs/images
 html/images/logos/*.* usr/share/nagios/htdocs/images/logos
-sample-config/*.cfg etc/nagios/
+sample-config/*.cfg sample-config/template-object/*.cfg etc/nagios/
 debian/apache.conf etc/nagios/
 debian/update-nagios usr/sbin/
 debian/upgrade-netsaint2nagios usr/sbin/
-debian/command.cfg etc/nagios/
+debian/checkcommands.cfg etc/nagios/
 debian/check-imap usr/lib/nagios/plugins

Index: nagios-common.postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.postinst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nagios-common.postinst	11 Nov 2004 00:01:50 -0000	1.2
+++ nagios-common.postinst	13 Nov 2004 23:56:20 -0000	1.3
@@ -181,7 +181,7 @@
     DEFAULTGW=$2
 
     TMPFILE=`tempfile -p nag.`
-    zcat /usr/share/doc/nagios-*/examples/hosts.cfg.gz | sed "s/@DEFAULT_GW@/$DEFAULTGW/" > $TMPFILE
+    zcat /usr/share/doc/nagios-*/examples/template-object/hosts.cfg.gz | sed "s/@DEFAULT_GW@/$DEFAULTGW/" > $TMPFILE
     mv $TMPFILE /etc/nagios/hosts.cfg
 fi
 
@@ -193,6 +193,9 @@
      ln -s /usr/lib/nagios/plugins/check_netsaint check_nagios)
 fi
 
+# Lets run update-nagios to be sure the plugins-auto.cfg exists (good to have for
+# package upgrades. :) ).
+/usr/sbin/update-nagios
 # 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: nagios-common.postrm
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.postrm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-common.postrm	9 Nov 2004 23:30:07 -0000	1.1
+++ nagios-common.postrm	13 Nov 2004 23:56:20 -0000	1.2
@@ -33,10 +33,11 @@
 
 case "$1" in
     purge|remove|abort-install|abort-upgrade|failed-upgrade|disappear)
+	invoke-rc.d nagios stop || true
 	if [ "$1" = "purge" ]; then
 	    db_purge
 	    # Remove logfiles
-	    rm -Rf /var/log/nagios /etc/nagios /usr/lib/nagios/plugins/check_nagios
+		rm -Rf {/var/cache,/var/run,/var/log,/etc}/nagios
 	else
 	    # Remove apache config if wanted.
 	    db_get nagios/configapache

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rules	11 Nov 2004 00:01:50 -0000	1.9
+++ rules	13 Nov 2004 23:56:20 -0000	1.10
@@ -50,14 +50,14 @@
 
 # --------- CLEAN TARGETS
 
-clean: clean1 unpatch
-clean1:
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir -a
 	dh_testroot -a
 
-	-rm -Rf docs examples binary-nagios-{text,pgsql,mysql}-stamp
+	-rm -Rf docs examples build-nagios-{text,pgsql,mysql}-stamp
 	-make distclean
-	-rm -Rf {cgi,base}/*.mysql {cgi,base}/*.pgsql {cgi,base}/*.text
+	-rm -Rf {cgi,base}/*.{mysql,pgsql,text}
 	-rm {patch,patch-no-defaults,install,configure,build}-stamp
 	-rm debian/templates.merged subst
 
@@ -65,29 +65,22 @@
 
 # --------- BINARY TARGETS
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir -a
-
-	@echo "Doing $@"
-	$(CONFIGURE)
-	touch configure-stamp
-
-binary-nagios-text: configure binary-nagios-text-stamp
-binary-nagios-text-stamp:
+build-nagios-text: build-nagios-text-stamp
+build-nagios-text-stamp:
 	dh_testdir -a
 	@echo "Doing $@"
 
+	$(CONFIGURE)
 	$(MAKE) all && \
 	  (cd base && mv nagios nagios.text); \
 	  (cd cgi && \
 	   for bin in $(CGIBINS); do \
 	     mv $$bin.cgi $$bin.cgi.text; \
 	   done);
-	touch binary-nagios-text-stamp
+	touch build-nagios-text-stamp
 
-binary-nagios-pgsql: binary-nagios-pgsql-stamp
-binary-nagios-pgsql-stamp:
+build-nagios-pgsql: build-nagios-pgsql-stamp
+build-nagios-pgsql-stamp:
 	dh_testdir -a
 	@echo "Doing $@"
 
@@ -100,14 +93,14 @@
 	     mv $$bin.cgi $$bin.cgi.pgsql; \
 	   done);
 
-	touch binary-nagios-pgsql-stamp
+	touch build-nagios-pgsql-stamp
 
-binary-nagios-mysql: binary-nagios-mysql-stamp
-binary-nagios-mysql-stamp:
+build-nagios-mysql: build-nagios-mysql-stamp
+build-nagios-mysql-stamp:
 	dh_testdir -a
 	@echo "Doing $@"
 
-	make clean;
+	-make clean;
 	$(CONFIGUREMY)
 	$(MAKE) all && \
 	  (cd base && mv nagios nagios.mysql); \
@@ -115,13 +108,12 @@
 	   for bin in $(CGIBINS); do \
 	     mv $$bin.cgi $$bin.cgi.mysql; \
 	   done);
-	touch binary-nagios-mysql-stamp
+	touch build-nagios-mysql-stamp
 
 build: build-stamp
-build-stamp: patch binary-nagios-text binary-nagios-pgsql binary-nagios-mysql
+build-stamp: patch build-nagios-text build-nagios-pgsql build-nagios-mysql
 	@echo "--- Compiling"
 	dh_testdir
-	po2debconf debian/templates > debian/templates.merged
 	touch build-stamp
 
 binary-arch: build nagios-text nagios-mysql nagios-pgsql
@@ -195,14 +187,17 @@
 	dh_installdirs 		 -p$@ -P$(b)/$@ 
 	dh_installdocs       -p$@ -P$(b)/$@
 	dh_installexamples   -p$@ -P$(b)/$@
+	(cd $(b) && for file in `find . -name '*.cfg.in'`; do \
+					rm -f $$file; \
+				done; \
+	)
 	dh_installchangelogs -p$@ -P$(b)/$@ Changelog
 	dh_installinit 		 -p$@ -P$(b)/$@ --name nagios
 	dh_install           -p$@ -P$(b)/$@
-# Remove checkcommands.cfg which is not to be shipped
-	rm -f $(maindir)/debian/$@/etc/nagios/checkcommands.cfg
 	chmod +x $(maindir)/debian/nagios-common/usr/lib/nagios/plugins/check-imap
 	chmod +x $(maindir)/debian/nagios-common/usr/lib/cgi-bin/nagios/traceroute.cgi
 	chmod 660 $(maindir)/debian/nagios-common/etc/nagios/resource.cfg
+	rm -f $(maindir)/debian/nagios-common/etc/nagios/hosts.cfg
 
 	dh_link              -p$@ -P$(b)/$@
 	dh_strip             -p$@ -P$(b)/$@
@@ -224,7 +219,7 @@
 # seperate it for the splits... Hint: Most of it is done with dh_install...
 	touch $(maindir)/install-stamp
 
-debian/po/templates.pot: debian/templates
+debian/po/templates.pot: debian/nagios-common.templates
 	@debconf-updatepo
 
 # Add stuff for dpatch (2.x way)
@@ -238,4 +233,4 @@
 	rm -rf patch-stamp debian/patched
 
 binary: binary-arch binary-indep
-.PHONY: binary-indep binary-arch binary-nagios-text binary-nagios-pgsql binary-nagios-mysql binary install patch unpatch
+.PHONY: binary-indep binary-arch build-nagios-text build-nagios-pgsql build-nagios-mysql binary install patch unpatch

Index: update-nagios
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/update-nagios,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- update-nagios	31 Oct 2004 09:59:29 -0000	1.1.1.1
+++ update-nagios	13 Nov 2004 23:56:20 -0000	1.2
@@ -2,13 +2,16 @@
 #
 
 OUT=/tmp/nagios_checkcommands.cfg
-DEST=/etc/nagios/checkcommands.cfg
+DEST=/var/cache/nagios/plugins-auto.cfg
 
 cat > $OUT <<EOT
 # This file was autogenerated on `date` and
 # should not be manually altered. Use update-nagios to
 # build this file. If you need to add a command specification, edit
 # the files in /etc/nagios-plugins/config/
+# or put a new command in /etc/nagios/checkcommands.cfg
+#
+# NOTE: Changes here are overwritten with the next update-nagios run!
 
 EOT
 
@@ -34,9 +37,9 @@
 		/etc/init.d/nagios reload
     fi
 else
-    echo "Created an empty checkcommands.cfg file, because no plugin configs"
-    echo "found in /usr/share/{nagios,netsaint}/pluginconfig. Won't reload nagios."
+    echo "Created an empty plugins-auto.cfg file, because no plugin configs"
+    echo "found in /etc/nagios-plugins/config. Won't reload nagios."
     exit 0
 fi
 
-ucf $OUT $DEST
+mv -f $OUT $DEST

Index: update-nagios.8
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/update-nagios.8,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- update-nagios.8	31 Oct 2004 09:59:29 -0000	1.1.1.1
+++ update-nagios.8	13 Nov 2004 23:56:20 -0000	1.2
@@ -1,6 +1,6 @@
 .TH NAGIOS 8
 .SH NAME
-update-nagios \- autogenerate nagios's commands file (checkcommands.cfg) file
+update-nagios \- autogenerate nagios's commands file file
 .SH SYNOPSIS
 .B update-nagios
 .I "[--no-reload]"
@@ -15,16 +15,9 @@
 solution gets included upstream.
 
 .SH FILES
-/etc/nagios/checkcommands.cfg \- auto-generated configuration file
+/var/cache/nagios/plugins-auto.cfg \- auto-generated configuration file
 .br
-/usr/share/{netsaint,nagios}/pluginconfig/*.cfg \- config fragments provided by plugin packages
-.PP
-The {netsaint,nagios} part means that it will search both /usr/share/netsaint/pluginconfig AND
-/usr/share/nagios/pluginconfig. This so that it will be backward compatible with Netsaint which
-is the old name of Nagios and be able to find the Debian GNU/Linux netsaint-plugins-* packages.
-.PP
-In Netsaint, this file was called plugins-auto.cfg, but it was changed/moved when Nagios was
-released (do NOT use the old name plugins-auto.cfg, it will NOT be found by nagios!).
+/etc/nagios-plugins/config/*.cfg \- config fragments provided by plugin packages
 
 .SH BUGS
 .PP

--- README.databases DELETED ---

--- command.cfg DELETED ---

--- templates DELETED ---