[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-2-2-g2d0c4bb

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 2d0c4bbd33b35fa7e18ce5b3e3c3c5602d59ea22
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Jan 9 20:24:10 2012 +0100

    Fix broker location in ido example config and enhance README

diff --git a/debian/icinga-idoutils.README.Debian b/debian/icinga-idoutils.README.Debian
index 9d8a26e..84eefa6 100644
--- a/debian/icinga-idoutils.README.Debian
+++ b/debian/icinga-idoutils.README.Debian
@@ -4,8 +4,10 @@ icinga-idoutils for Debian
 The idoutils include a Nagios event broker module (idomod.o) that exports
 data from the Icinga daemon. You have to enable it after installing the package
 
-Edit /etc/icinga/icinga.cfg and change or append the following line: 
+Either edit /etc/icinga/icinga.cfg and change or append the following line:
 broker_module=/usr/lib/icinga/idomod.o config_file=/etc/icinga/idomod.cfg
+or rename /etc/icinga/modules/idoutils.cfg-sample to
+/etc/icinga/modules/idoutils.cfg.
 
 Don't forget to restart Icinga after changing the configuration:
 
diff --git a/debian/rules b/debian/rules
index 516a179..62bfd5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,6 +71,8 @@ fix-configs-stamp: configure-stamp
 	    sample-config/cgi.cfg > debian-configs/cgi.cfg
 	sed -i -e 's/local-service/generic-service/' \
 		module/idoutils/config/ido2db_check_proc.cfg
+	sed -i -e 's#/usr/sbin/#/usr/lib/icinga/#' \
+		module/idoutils/config/idoutils.cfg-sample
 	sed -e '/Sample Main Config/ s/\([0-9]\.[0-9]\.[0-9]\)//' \
 	    -e '/Last Modified/ d' \
 	    sample-config/icinga.cfg > debian-configs/icinga.cfg
@@ -123,6 +125,7 @@ install-stamp: build-stamp fix-configs-stamp
 	dh_installdirs -a -i  
 	make install-unstripped DESTDIR=$b/tmp INSTALL_OPTS="" COMMAND_OPTS=""
 	make install-idoutils DESTDIR=$b/icinga-idoutils INSTALL_OPTS="" COMMAND_OPTS=""
+	rm $b/icinga-idoutils/etc/icinga/ido2db.cfg-sample
 	#We have to rename the sample files 
 	#mv $b/icinga-idoutils/etc/icinga/ido2db.cfg-sample $b/icinga-idoutils/etc/icinga/ido2db.cfg
 	mv $b/icinga-idoutils/etc/icinga/idomod.cfg-sample $b/icinga-idoutils/etc/icinga/idomod.cfg

-- 
debian packaging of icinga(-core)