From 3eda4a363733ec86ee56cf3a67c6df86154a65e9 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 7 Apr 2008 17:06:29 +0000 Subject: [PATCH] Zum Laufen gebracht git-svn-id: http://svn.brehm-online.com/svn/portage@57 18afd0d2-9f2f-0410-a0ac-b8d70fd81a6b --- net-analyzer/ndoutils/Manifest | 4 +-- net-analyzer/ndoutils/files/ndo2db.conf.d | 6 ----- net-analyzer/ndoutils/files/ndo2db.init | 7 ++--- .../ndoutils/ndoutils-1.4_beta7-r1.ebuild | 27 +++++++------------ 4 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 net-analyzer/ndoutils/files/ndo2db.conf.d diff --git a/net-analyzer/ndoutils/Manifest b/net-analyzer/ndoutils/Manifest index 3221a9f..d9334db 100644 --- a/net-analyzer/ndoutils/Manifest +++ b/net-analyzer/ndoutils/Manifest @@ -1,4 +1,4 @@ AUX ndo2db.conf.d 169 RMD160 616e7929de6b040f3ca3acf6bd5e93d5ca2bd5b7 SHA1 963b17c47e134f1bab6986a069d9422c3668ea1f SHA256 001058fa468969f640df62c6b9a50254a5f17deae44e0dff4daef7d5b75d9df1 -AUX ndo2db.init 697 RMD160 0a9b1d3a8618fad92be7836b9a9d8e09f980e866 SHA1 891cd2868fdcaa0c009375b993a4f85ec1b8c3e0 SHA256 ff9796112855897b2f743e66d38fc373cfab68e78c1ae8b85dbf654c3dedba70 +AUX ndo2db.init 610 RMD160 e374234aa4c0af975d1bc7c2f5e76619b64428cb SHA1 9bcb93681e4208763bb68e0fc6177ee2aa2e303e SHA256 011969ec965f71659e928d1f0cb3272043d78857d75609c805b611c5a57d143e DIST ndoutils-1.4b7.tar.gz 1553879 RMD160 a5cb66c59cf20705f54d1c8dda5ed244daf9b2fc SHA1 9b02fda9a612f07d6aa353c9a4a01be121094224 SHA256 76053576fa55f0231917733fc8e7a95d93e013cdb693fadbd8e8a7aa9ac8162c -EBUILD ndoutils-1.4_beta7-r1.ebuild 2147 RMD160 7f949e2e797e514e3c8bb65194317e4c74404ce3 SHA1 469e108f031d041b7c1363e0cb8fac12800d8e5b SHA256 68f02e508cd943b080d0291788375faaa778c138cf5e2512aade385cfbed6037 +EBUILD ndoutils-1.4_beta7-r1.ebuild 1779 RMD160 74be1e7d61d6276bb6e8c9874bd263a16e8366c6 SHA1 624630b9355a76dbbddbcb5988082c656d2796f1 SHA256 705bd37a0be1fb51a6b377fc5ee94ec2887e7fcd9f504b9429d8e6ee24488839 diff --git a/net-analyzer/ndoutils/files/ndo2db.conf.d b/net-analyzer/ndoutils/files/ndo2db.conf.d deleted file mode 100644 index 0927944..0000000 --- a/net-analyzer/ndoutils/files/ndo2db.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# /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 d328be9..3dea06b 100755 --- a/net-analyzer/ndoutils/files/ndo2db.init +++ b/net-analyzer/ndoutils/files/ndo2db.init @@ -4,9 +4,6 @@ # $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 @@ -15,14 +12,14 @@ depends() { start() { ebegin "Starting ndo2db" - start-stop-daemon --start --quiet --exec /usr/nagios/bin/ndo2db-${MY_NAGIOS_MAIN_VERSION}x \ + start-stop-daemon --start --quiet --exec /usr/sbin/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-${MY_NAGIOS_MAIN_VERSION}x + start-stop-daemon --stop --quiet --exec /usr/sbin/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 3d83f2f..d8e6f4b 100644 --- a/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild +++ b/net-analyzer/ndoutils/ndoutils-1.4_beta7-r1.ebuild @@ -17,7 +17,7 @@ IUSE="" DEPEND="dev-db/mysql" RDEPEND="${DEPEND} - >=net-analyzer/nagios-core-2.7" + >=net-analyzer/nagios-core-3.0" S="${WORKDIR}/${MY_P}" @@ -28,48 +28,39 @@ pkg_setup() { src_compile() { econf \ - --prefix=/usr/nagios \ + --prefix=/usr \ + --bindir=/usr/sbin \ --sysconfdir=/etc/nagios \ + --with-ndo2db-user=nagios \ + --with-ndo2db-group=nagios \ --enable-mysql \ --disable-pgsql || die "econf failed" - emake || die "emake failed" + emake -j1 || die "emake failed" } src_install() { - dodir /usr/nagios/bin - cp ${S}/src/{file2sock,log2ndo,ndo2db-2x,ndo2db-3x,ndomod-2x.o,ndomod-3x.o,sockdebug} ${D}/usr/nagios/bin + dodir /usr/sbin + cp ${S}/src/{file2sock,log2ndo,ndo2db-3x,ndomod-3x.o,sockdebug} ${D}/usr/sbin dodir /usr/nagios/share/ cp -R ${S}/db ${D}/usr/nagios/share - chown -R root:nagios ${D}/usr/nagios || die "Failed chown of ${D}/usr/nagios" - chmod 750 ${D}/usr/nagios/bin/{file2sock,log2ndo,ndo2db-2x,ndo2db-3x,ndomod-2x.o,ndomod-3x.o,sockdebug} || "Failed chmod" + chmod 755 ${D}/usr/sbin/{file2sock,log2ndo,ndo2db-3x,ndomod-3x.o,sockdebug} || "Failed chmod" dodoc README REQUIREMENTS TODO UPGRADING Changelog "docs/NDOUTILS DB Model.pdf" "docs/NDOUtils Documentation.pdf" -cat << EOF > "${T}"/55-ndoutils-revdep -SEARCH_DIRS="/usr/nagios/bin" -EOF - sed -i s:socket_name=/usr/local/nagios/var/ndo.sock:socket_name=/var/nagios/ndo.sock:g ${S}/config/ndo2db.cfg - insinto /etc/revdep-rebuild - doins "${T}"/55-ndoutils-revdep - insinto /etc/nagios doins ${S}/config/ndo2db.cfg doins ${S}/config/ndomod.cfg newinitd ${FILESDIR}/ndo2db.init ndo2db - newconfd ${FILESDIR}/ndo2db.conf.d ndo2db } pkg_postinst() { elog "To include NDO in your Nagios setup you'll need to activate the NDO broker module" elog "in /etc/nagios/nagios.cfg:" - elog "\tbroker_module=/usr/nagios/bin/ndomod-2x.o config_file=/etc/nagios/ndomod.cfg" - elog "\t\tor" elog "\tbroker_module=/usr/nagios/bin/ndomod-3x.o config_file=/etc/nagios/ndomod.cfg" - elog "\t\trespectively." } -- 2.39.5