[Pkg-nagios-changes] [pkg-nagios] r696 - nagios2/trunk/debian

[Sean Finney]

Author: seanius
Date: 2006-02-12 10:21:36 +0000 (Sun, 12 Feb 2006)
New Revision: 696

Added:
   nagios2/trunk/debian/nagios2.manpages
Removed:
   nagios2/trunk/debian/nagios2-common.manpages
Modified:
   nagios2/trunk/debian/cfg-nagios.cfg.diff
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/nagios2-common.postinst
   nagios2/trunk/debian/nagios2-common.postrm
   nagios2/trunk/debian/nagios2stats.8
   nagios2/trunk/debian/rules
Log:
okay, this is it!
- we'll have to add in extcommand support later
- moved the manpages to the nagios2 deb per policy
- a couple permissions fixes


Modified: nagios2/trunk/debian/cfg-nagios.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-nagios.cfg.diff	2006-02-11 13:56:28 UTC (rev 695)
+++ nagios2/trunk/debian/cfg-nagios.cfg.diff	2006-02-12 10:21:36 UTC (rev 696)
@@ -79,17 +79,6 @@
  
  
  
-@@ -128,8 +134,8 @@
- # you will have to enable this.  Setting this value to 0 disables command
- # checking (the default), other values enable it.
- 
--check_external_commands=0
--
-+# NOTE: on debian the configuration option is specified in a seperate file:
-+#       /etc/nagios2/conf.d/extcommands.cfg
- 
- 
- # EXTERNAL COMMAND CHECK INTERVAL
 @@ -193,7 +199,7 @@
  # is created, used, and deleted throughout the time that Nagios is
  # running.

Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-02-11 13:56:28 UTC (rev 695)
+++ nagios2/trunk/debian/changelog	2006-02-12 10:21:36 UTC (rev 696)
@@ -1,7 +1,7 @@
-nagios2 (2.0-1) UNRELEASED; urgency=low
+nagios2 (2.0-1) unstable; urgency=low
 
-  * NOT RELEASED YET
   * First build with upstream's release version
+
   [sean finney]
   * cleanup/simplification of http admin username/password handling
     in maintscripts.
@@ -25,7 +25,7 @@
   * a few misc additions/edits to our default configuration.
   * added manpages for nagios2(8) and nagios2stats(8)
 
- -- sean finney <seanius at debian.org>  Sat, 11 Feb 2006 14:50:13 +0100
+ -- sean finney <seanius at debian.org>  Sun, 12 Feb 2006 11:19:28 +0100
 
 nagios2 (0rc2-2.0-2) experimental; urgency=low
 

Deleted: nagios2/trunk/debian/nagios2-common.manpages
===================================================================
--- nagios2/trunk/debian/nagios2-common.manpages	2006-02-11 13:56:28 UTC (rev 695)
+++ nagios2/trunk/debian/nagios2-common.manpages	2006-02-12 10:21:36 UTC (rev 696)
@@ -1,2 +0,0 @@
-nagios2.8
-nagios2stats.8

Modified: nagios2/trunk/debian/nagios2-common.postinst
===================================================================
--- nagios2/trunk/debian/nagios2-common.postinst	2006-02-11 13:56:28 UTC (rev 695)
+++ nagios2/trunk/debian/nagios2-common.postinst	2006-02-12 10:21:36 UTC (rev 696)
@@ -49,10 +49,11 @@
 	set -- `route -n | grep '^0.0.0.0' | head -n1`
 	DEFAULTGW=$2
 	sed -e "s,GW,$DEFAULTGW," $usn/debian/gateway.cfg > $tmpgw
+	chmod 644 $tmpgw
 	ucf $tmpgw $enc/host-gateway_nagios2.cfg
 
 	# this is where the debconf-ized external command support would go
-	ucf $usn/nagios2/debian/extcommands.cfg $enc/extcommands-nagios2.cfg
+	#ucf $usn/debian/extcommands.cfg $enc/extcommands-nagios2.cfg
 
 	# configure the web servers, if it is desired
 	if [ "$servers" ]; then

Modified: nagios2/trunk/debian/nagios2-common.postrm
===================================================================
--- nagios2/trunk/debian/nagios2-common.postrm	2006-02-11 13:56:28 UTC (rev 695)
+++ nagios2/trunk/debian/nagios2-common.postrm	2006-02-12 10:21:36 UTC (rev 696)
@@ -9,10 +9,10 @@
 	rm -f /etc/nagios2/htpasswd.users
 	rm -f /etc/nagios2/apache2.conf
 	rm -f /etc/nagios2/conf.d/host-gateway_nagios2.cfg
-	rm -f /etc/nagios2/conf.d/extcommands_nagios2.cfg
+	#rm -f /etc/nagios2/conf.d/extcommands_nagios2.cfg
 	ucf --purge /etc/nagios2/apache2.conf
 	ucf --purge /etc/nagios2/conf.d/host-gateway_nagios2.cfg
-	ucf --purge /etc/nagios2/conf.d/extcommands_nagios2.cfg
+	#ucf --purge /etc/nagios2/conf.d/extcommands_nagios2.cfg
     ;;
 esac
 

Added: nagios2/trunk/debian/nagios2.manpages
===================================================================
--- nagios2/trunk/debian/nagios2.manpages	2006-02-11 13:56:28 UTC (rev 695)
+++ nagios2/trunk/debian/nagios2.manpages	2006-02-12 10:21:36 UTC (rev 696)
@@ -0,0 +1,2 @@
+debian/nagios2.8
+debian/nagios2stats.8

Modified: nagios2/trunk/debian/nagios2stats.8
===================================================================
--- nagios2/trunk/debian/nagios2stats.8	2006-02-11 13:56:28 UTC (rev 695)
+++ nagios2/trunk/debian/nagios2stats.8	2006-02-12 10:21:36 UTC (rev 696)
@@ -3,7 +3,7 @@
 nagios2stats \- report statistics information from the nagios system
 
 .SH SYNOPSIS
-.B nagios2 [\-hVL] [\-c config] [\-m] [\-d]
+.B nagios2stats [\-hVL] [\-c config] [\-m] [\-d]
 .br
 .Xc
 

Modified: nagios2/trunk/debian/rules
===================================================================
--- nagios2/trunk/debian/rules	2006-02-11 13:56:28 UTC (rev 695)
+++ nagios2/trunk/debian/rules	2006-02-12 10:21:36 UTC (rev 696)
@@ -146,6 +146,7 @@
 	mv ${b}/nagios2/usr/sbin/nagiostats ${b}/nagios2/usr/sbin/nagios2stats
 	mv ${b}/nagios2/usr/sbin/p1.pl ${b}/nagios2/usr/lib/nagios2/p1.pl
 	dh_installdocs       -i
+	dh_installman        -a -pnagios2
 	dh_installchangelogs -i
 	dh_install           -i
 	dh_installinit 	     --name nagios2 -- defaults 30 18
@@ -179,7 +180,6 @@
 binary-indep: install-stamp
 	# XXX some stuff below here is commented out
 	#install -m 755 cgi/grouplist.cgi.in debian/$@/usr/lib/cgi-bin/nagios/grouplist.cgi
-	dh_installmanpages   -i
 	dh_compress          -i
 	dh_fixperms          -i -Xnagios2/resource.cfg
 	dh_installdebconf    -i