| 1 |
flameeyes 12/08/23 21:23:31 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog |
| 4 |
Added: nagios-nsca-2.7.2-r103.ebuild |
| 5 |
Log: |
| 6 |
Revision bump: add a minimal USE flag to only build send_nsca instead of the daemon; add a dependency on either nagios or icinga for the non-minimal install; install a configuration file with icinga defaults (user/group and paths); allow changing the configuration file for the init script (install conf.d file for that) and depend properly on icinga/nagios. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.7 net-analyzer/nagios-nsca/metadata.xml |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/metadata.xml?rev=1.7&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/metadata.xml?rev=1.7&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/metadata.xml?r1=1.6&r2=1.7 |
| 16 |
|
| 17 |
Index: metadata.xml |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/metadata.xml,v |
| 20 |
retrieving revision 1.6 |
| 21 |
retrieving revision 1.7 |
| 22 |
diff -u -r1.6 -r1.7 |
| 23 |
--- metadata.xml 21 Aug 2012 17:30:54 -0000 1.6 |
| 24 |
+++ metadata.xml 23 Aug 2012 21:23:31 -0000 1.7 |
| 25 |
@@ -25,6 +25,11 @@ |
| 26 |
flag unless all the communication will be handled in an |
| 27 |
absolutely safe environment. |
| 28 |
</flag> |
| 29 |
+ <flag name='minimal'> |
| 30 |
+ Only build and install the send_nsca command and not the |
| 31 |
+ daemon. This allows a very minimal install with no overhead when |
| 32 |
+ setting up a node. |
| 33 |
+ </flag> |
| 34 |
</use> |
| 35 |
</pkgmetadata> |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.42 net-analyzer/nagios-nsca/ChangeLog |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog?rev=1.42&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog?rev=1.42&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog?r1=1.41&r2=1.42 |
| 45 |
|
| 46 |
Index: ChangeLog |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog,v |
| 49 |
retrieving revision 1.41 |
| 50 |
retrieving revision 1.42 |
| 51 |
diff -u -r1.41 -r1.42 |
| 52 |
--- ChangeLog 21 Aug 2012 17:30:54 -0000 1.41 |
| 53 |
+++ ChangeLog 23 Aug 2012 21:23:31 -0000 1.42 |
| 54 |
@@ -1,6 +1,16 @@ |
| 55 |
# ChangeLog for net-analyzer/nagios-nsca |
| 56 |
# Copyright 2002-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog,v 1.41 2012/08/21 17:30:54 flameeyes Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog,v 1.42 2012/08/23 21:23:31 flameeyes Exp $ |
| 59 |
+ |
| 60 |
+*nagios-nsca-2.7.2-r103 (23 Aug 2012) |
| 61 |
+ |
| 62 |
+ 23 Aug 2012; Diego E. Pettenò <flameeyes@g.o> +files/nsca.conf, |
| 63 |
+ +nagios-nsca-2.7.2-r103.ebuild, files/nsca.init, metadata.xml: |
| 64 |
+ Revision bump: add a minimal USE flag to only build send_nsca instead of the |
| 65 |
+ daemon; add a dependency on either nagios or icinga for the non-minimal |
| 66 |
+ install; install a configuration file with icinga defaults (user/group and |
| 67 |
+ paths); allow changing the configuration file for the init script (install |
| 68 |
+ conf.d file for that) and depend properly on icinga/nagios. |
| 69 |
|
| 70 |
*nagios-nsca-2.7.2-r102 (21 Aug 2012) |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.1 net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r103.ebuild |
| 76 |
|
| 77 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r103.ebuild?rev=1.1&view=markup |
| 78 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r103.ebuild?rev=1.1&content-type=text/plain |
| 79 |
|
| 80 |
Index: nagios-nsca-2.7.2-r103.ebuild |
| 81 |
=================================================================== |
| 82 |
# Copyright 1999-2012 Gentoo Foundation |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.7.2-r103.ebuild,v 1.1 2012/08/23 21:23:31 flameeyes Exp $ |
| 85 |
|
| 86 |
EAPI=4 |
| 87 |
|
| 88 |
inherit multilib user eutils |
| 89 |
|
| 90 |
DESCRIPTION="Nagios NSCA - Nagios Service Check Acceptor" |
| 91 |
HOMEPAGE="http://www.nagios.org/" |
| 92 |
SRC_URI="mirror://sourceforge/nagios/nsca-${PV}.tar.gz" |
| 93 |
|
| 94 |
LICENSE="GPL-2" |
| 95 |
SLOT="0" |
| 96 |
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" |
| 97 |
IUSE="tcpd +crypt minimal" |
| 98 |
|
| 99 |
DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 ) |
| 100 |
!minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )" |
| 101 |
|
| 102 |
RDEPEND="${DEPEND} |
| 103 |
!minimal? ( || ( net-analyzer/icinga net-analyzer/nagios ) ) |
| 104 |
sys-apps/openrc" |
| 105 |
|
| 106 |
S="${WORKDIR}/nsca-${PV}" |
| 107 |
|
| 108 |
pkg_setup() { |
| 109 |
if ! use minimal; then |
| 110 |
enewgroup nagios |
| 111 |
enewgroup icinga |
| 112 |
enewuser nagios -1 /bin/bash /var/nagios/home nagios |
| 113 |
enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" |
| 114 |
fi |
| 115 |
} |
| 116 |
|
| 117 |
src_configure() { |
| 118 |
use tcpd || export ac_cv_lib_wrap_main=no |
| 119 |
use crypt || export ac_cv_path_LIBMCRYPT_CONFIG=/bin/false |
| 120 |
|
| 121 |
econf \ |
| 122 |
--localstatedir=/var/nagios \ |
| 123 |
--sysconfdir=/etc/nagios \ |
| 124 |
--with-nsca-user=nagios \ |
| 125 |
--with-nsca-grp=nagios |
| 126 |
} |
| 127 |
|
| 128 |
src_compile() { |
| 129 |
emake -C src send_nsca $(usex !minimal nsca) |
| 130 |
|
| 131 |
# prepare the alternative configuration file |
| 132 |
sed \ |
| 133 |
-e '/ncsa_\(user\|group\)/s:nagios:icinga:' \ |
| 134 |
-e '/ncsa_chroot/s:=.*:=/var/lib/icinga/rw:' \ |
| 135 |
-e '/\(command\|alternate_dump\)_file/s:/var/nagios:/var/lib/icinga:' \ |
| 136 |
"${S}"/sample-config/nsca.cfg > "${T}"/nsca.icinga.cfg |
| 137 |
} |
| 138 |
|
| 139 |
src_install() { |
| 140 |
dodoc LEGAL Changelog README SECURITY |
| 141 |
|
| 142 |
dobin src/send_nsca |
| 143 |
|
| 144 |
insinto /etc/nagios |
| 145 |
doins "${S}"/sample-config/send_nsca.cfg |
| 146 |
|
| 147 |
if ! use minimal; then |
| 148 |
exeinto /usr/libexec |
| 149 |
doexe src/nsca |
| 150 |
|
| 151 |
newinitd "${FILESDIR}"/nsca.init nsca |
| 152 |
newconfd "${FILESDIR}"/nsca.conf nsca |
| 153 |
|
| 154 |
insinto /etc/nagios |
| 155 |
doins "${S}"/sample-config/nsca.cfg |
| 156 |
|
| 157 |
insinto /etc/icinga |
| 158 |
newins "${T}"/nsca.icinga.cfg nsca.cfg |
| 159 |
fi |
| 160 |
} |
| 161 |
|
| 162 |
pkg_postinst() { |
| 163 |
if ! use minimal; then |
| 164 |
elog "If you are using the nsca daemon, remember to edit" |
| 165 |
elog "the config file /etc/nagios/nsca.cfg" |
| 166 |
elog "" |
| 167 |
elog "If you intend to use nsca with Icinga, change the" |
| 168 |
elog "configuration file path in /etc/conf.d/nsca so that" |
| 169 |
elog "it will default to the correct paths and users." |
| 170 |
fi |
| 171 |
} |
Archives