From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 7 Apr 2008 14:32:41 +0000 (+0000)
Subject: weitere Anpassung an Nagios 3.x
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=8f58537c1cd14c462f8284f6e464b7dad989003f;p=portage.git

weitere Anpassung an Nagios 3.x

git-svn-id: http://svn.brehm-online.com/svn/portage@56 18afd0d2-9f2f-0410-a0ac-b8d70fd81a6b
---

diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest
index 6365a61..3221a9f 100644
--- a/net-analyzer/ndoutils/Manifest
+++ b/net-analyzer/ndoutils/Manifest
@@ -1,3 +1,4 @@
-AUX ndo2db.init 547 RMD160 f463c156a0577585809d8a01470b042d535f4a98 SHA1 d04b6030285d415cb8b032a27816401bd2bc542b SHA256 46d482286bc19e3cb31a4a3caca1c98fa23282e442729e49d0739f8a254b563c
+AUX ndo2db.conf.d 169 RMD160 616e7929de6b040f3ca3acf6bd5e93d5ca2bd5b7 SHA1 963b17c47e134f1bab6986a069d9422c3668ea1f SHA256 001058fa468969f640df62c6b9a50254a5f17deae44e0dff4daef7d5b75d9df1
+AUX ndo2db.init 697 RMD160 0a9b1d3a8618fad92be7836b9a9d8e09f980e866 SHA1 891cd2868fdcaa0c009375b993a4f85ec1b8c3e0 SHA256 ff9796112855897b2f743e66d38fc373cfab68e78c1ae8b85dbf654c3dedba70
 DIST ndoutils-1.4b7.tar.gz 1553879 RMD160 a5cb66c59cf20705f54d1c8dda5ed244daf9b2fc SHA1 9b02fda9a612f07d6aa353c9a4a01be121094224 SHA256 76053576fa55f0231917733fc8e7a95d93e013cdb693fadbd8e8a7aa9ac8162c
-EBUILD ndoutils-1.4_beta7-r1.ebuild 2104 RMD160 8a314e41c32acab4a55718899b9c15bcb6742df6 SHA1 b17eff2fe42e526de2002ef900f6c5327442b1c7 SHA256 f2179c5aa6fbf8811cb5b8d50ac61e17c3ee9b88c14293e052159b18723c7366
+EBUILD ndoutils-1.4_beta7-r1.ebuild 2147 RMD160 7f949e2e797e514e3c8bb65194317e4c74404ce3 SHA1 469e108f031d041b7c1363e0cb8fac12800d8e5b SHA256 68f02e508cd943b080d0291788375faaa778c138cf5e2512aade385cfbed6037
diff --git a/net-analyzer/ndoutils/files/ndo2db.conf.d b/net-analyzer/ndoutils/files/ndo2db.conf.d
new file mode 100644
index 0000000..0927944
--- /dev/null
+++ b/net-analyzer/ndoutils/files/ndo2db.conf.d
@@ -0,0 +1,6 @@
+# /etc/conf.d/ndo2db: config file for /etc/init.d/ndo2db
+
+# Decide, whether you using Nagios 2.x or Nagios 3.x
+# (Valid values are  "2" or "3")
+NAGIOS_MAIN_VERSION="3"
+
diff --git a/net-analyzer/ndoutils/files/ndo2db.init b/net-analyzer/ndoutils/files/ndo2db.init
index d2864be..d328be9 100755
--- a/net-analyzer/ndoutils/files/ndo2db.init
+++ b/net-analyzer/ndoutils/files/ndo2db.init
@@ -3,6 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/ndoutils/files/ndo2db.init,v 1.1 2007/07/01 08:29:56 dertobi123 Exp $
 
+MY_NAGIOS_MAIN_VERSION=3
+if [ "$NAGIOS_MAIN_VERSION" = "2" ] ; then
+    MY_NAGIOS_MAIN_VERSION=2
+fi
+
 depends() {
 	before nagios
 	need mysql
@@ -10,13 +15,14 @@ depends() {
 
 start() {
 	ebegin "Starting ndo2db"
-	start-stop-daemon --start --quiet --exec /usr/nagios/bin/ndo2db-2x \
+	start-stop-daemon --start --quiet --exec /usr/nagios/bin/ndo2db-${MY_NAGIOS_MAIN_VERSION}x \
 	-- -c /etc/nagios/ndo2db.cfg
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ndo2db"
-	start-stop-daemon --stop --quiet --exec /usr/nagios/bin/ndo2db-2x
+	start-stop-daemon --stop --quiet --exec /usr/nagios/bin/ndo2db-${MY_NAGIOS_MAIN_VERSION}x
 	eend $?
 }
+
diff --git a/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild b/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild
index efa91c0..3d83f2f 100644
--- a/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild
@@ -62,6 +62,7 @@ EOF
 	doins ${S}/config/ndomod.cfg
 
 	newinitd ${FILESDIR}/ndo2db.init ndo2db
+	newconfd ${FILESDIR}/ndo2db.conf.d ndo2db
 }
 
 pkg_postinst() {