[Pkg-nagios-devel] nagios changelog,1.5,1.6 rules,1.6,1.7

[joerg@haydn.debian.org]

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

Modified Files:
	changelog rules 
Log Message:
Ok, lets write some of the closed bugs in changelog, to keep track of what is done.
And fix a nasty bug that always lead to the inclusion of a buggy default nagios.cfg
rules changed the nagios.cfg (and cgi.cfg) with sed to point to the right directorys and
the next command overwrote this changed version with a thing similar to
"mmv *.cfg-sample #1.cfg", ie copying the samples over the changed versions....


Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- changelog	1 Nov 2004 23:05:14 -0000	1.5
+++ changelog	3 Nov 2004 22:58:11 -0000	1.6
@@ -12,6 +12,12 @@
   	  (Yes, actually Piotr fixed the init-script for this with his NMU, but
   	  he forgot all the other things where it is mentioned. And var/run fits
       better IMO).
+      Fixes "nagios: Nagios command fifo location violates FHS", thanks
+      to Jeroen van Wolffelaar (Closes: #268230).
+    - 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
+      (Closes: #277049).
     - Change debian/rules, first half is done, but still needs some work.
     - Try to clean the install-stamp: target a bit and do more things with
       dh_install, to get a more readable rules file.
@@ -22,7 +28,7 @@
       closes: #248725, #269313.
     - adduser and debconf are now normal dependencies
 
- -- Joerg Jaspert <joerg@debian.org>  Sun, 31 Oct 2004 22:46:39 +0100
+ -- Joerg Jaspert <joerg@debian.org>  Wed,  3 Nov 2004 23:44:14 +0100
 
 nagios (2:1.2-3.6) unstable; urgency=high
 

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rules	3 Nov 2004 22:32:03 -0000	1.6
+++ rules	3 Nov 2004 22:58:11 -0000	1.7
@@ -234,7 +234,7 @@
 	       install -m 755 contrib/traceroute.cgi $(maindir)/debian/nagios-$$dir/usr/lib/cgi-bin/nagios/; \
 	       cat sample-config/nagios.cfg | \
 	         sh $(maindir)/debian/scripts/addpluginseg | \
-	         sed -e 's@command_file=/var/log@command_file=/var/cache@' \
+	         sed -e 's@command_file=/var/log/nagios/rw@command_file=/var/run/nagios@' \
 		     -e 's@temp_file=/var/log@temp_file=/var/cache@' \
 		     -e 's@state_retention_file=/var/log@state_retention_file=/var/cache@' \
 		     -e 's@status_file=/var/log@status_file=/var/cache@' \
@@ -244,12 +244,12 @@
 	         sed -e "s@^#authorized_for_\(.*\)=.*@authorized_for_\1=nagiosadmin@" \
 		     > $(maindir)/debian/nagios-$$dir/etc/nagios/cgi.cfg.new; \
 	     cd $(maindir)/debian/nagios-$$dir/etc/nagios; \
-	       mv nagios.cfg.new nagios.cfg; \
-	       mv cgi.cfg.new cgi.cfg; \
 	       for file in `find . -name '*-sample'`; do \
 	         new=`echo $$file | sed 's@-sample@@'`; \
-		 mv $$file $$new; \
+		 	 mv $$file $$new; \
 	       done; \
+	       mv nagios.cfg.new nagios.cfg; \
+	       mv cgi.cfg.new cgi.cfg; \
 	       mkdir -p ../../usr/share/doc/nagios-$$dir/examples; \
 	       mv hosts.cfg ../../usr/share/doc/nagios-$$dir/examples/hosts.cfg; \
 	     if [ ! -d "$(maindir)/debian/nagios-$$dir/etc/nagios/stylesheets" ]; then \