[Pkg-nagios-changes]
nsca/debian NEWS, NONE, 1.1 README.debian, 1.1,
1.2 changelog, 1.5, 1.6 compat, NONE, 1.1 control, 1.4,
1.5 nsca.1, NONE, 1.1 nsca.init, 1.2,
1.3 nsca.lintian-overrides, NONE, 1.1 postinst, 1.1,
1.2 postrm, 1.1, 1.2 rules, 1.3, 1.4 send_nsca.1, NONE, 1.1
seanius at haydn.debian.org
seanius at haydn.debian.org
Sun Dec 11 01:39:14 UTC 2005
Update of /cvsroot/pkg-nagios/nsca/debian
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv12088/debian
Modified Files:
README.debian changelog control nsca.init postinst postrm
rules
Added Files:
NEWS compat nsca.1 nsca.lintian-overrides send_nsca.1
Log Message:
some nsca work
--- NEW FILE: NEWS ---
nsca no longer uses inetd, but instead runs in a daemon mode.
this should make lives easier as before it was only compatible with
one inetd, and registering/configuring with the different inetd
services is a conceptually broken process anyway.
-- sean finney <seanius at debian.org> Sat, 10 Dec 2005 21:57:09 +0100
Index: README.debian
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/debian/README.debian,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.debian 29 Oct 2005 11:38:05 -0000 1.1
+++ README.debian 11 Dec 2005 01:39:10 -0000 1.2
@@ -1,12 +1,21 @@
nsca for Debian
---------------
-This is the debian package of nsca. Currently you've to add this line
-to /etc/services to make it work:
+This is the debian package of nsca. by default nsca works with an
+init script /etc/init.d/nsca, however, it can also be run from the
+various inetd implementations.
+
+if you want nsca to work with inetd, you need to add the following
+line to your inetd.conf:
+
+5667 stream tcp nowait nagios /usr/sbin/tcpd /usr/sbin/nsca -c /etc/nsca.cfg --inetd
+
+or optionally the xinetd configuration file in the examples directory.
+
+also add following line to /etc/services:
nsca 5667/tcp # NSCA
-Edit the config files to fit your needs and reload inetd.
+Edit the nsca/send_nsca config files to fit your needs and reload inetd.
----
-Cajus Pollmeier <cajus at debian.org>, Mon, 29 Mar 2004 15:39:36 +0200
+ -- sean finney <seanius at debian.org> Sat, 10 Dec 2005 22:04:20 +0100
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/debian/changelog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- changelog 5 Dec 2005 10:51:00 -0000 1.5
+++ changelog 11 Dec 2005 01:39:10 -0000 1.6
@@ -1,3 +1,13 @@
+nsca (2.4-6) unstable; urgency=low
+
+ * Sean Finney:
+ - errors and warnings now go to stderr (closes: #294097).
+ - move away from this debmake stuff for building, because
+ i don't understand it and it's getting to the point i have
+ to work with it.
+
+ -- sean finney <seanius at debian.org> Sat, 10 Dec 2005 21:17:36 +0100
+
nsca (2.4-5) unstable; urgency=low
* Sean Finney:
--- NEW FILE: compat ---
4
Index: control
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/debian/control,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- control 5 Dec 2005 10:51:00 -0000 1.4
+++ control 11 Dec 2005 01:39:10 -0000 1.5
@@ -4,7 +4,7 @@
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
Uploaders: sean finney <seanius at debian.org>, Cajus Pollmeier <cajus at debian.org>
Standards-Version: 3.6.2
-Build-Depends: libmcrypt-dev, debmake, dpatch
+Build-Depends: libmcrypt-dev, dpatch, debhelper (>= 4.0.0)
Package: nsca
Architecture: any
--- NEW FILE: nsca.1 ---
.TH nsca "1" "December 2005" "nsca"
.SH NAME
nsca \- Nagios Service Check Acceptor
.SH SYNOPSIS
.B nsca \-c <config_file> [\-f] [--inetd|--daemon|--single]
.br
.Xc
.SH DESCRIPTION
.B nsca
This program is designed to accept passive check results from
remote hosts that use the send_nsca(1) utility. It can run as a service
under inetd or xinetd (read the docs for info on this), or as a
standalone daemon.
.SH OPTIONS
.TP
config_file
Name of config file to use
.TP
\-f
run in the foreground (do not fork)
.TP
\-\-inetd
Run as a service under inetd or xinetd
.TP
\-\-daemon
Run as a standalone multi\-process daemon
.TP
\-\-single
Run as a standalone single\-process daemon
.SH SEE ALSO
.TP
nsca(1)
.SH FILES
.TP
/etc/nsca.cfg
nsca server configuration
.TP
/etc/send_nsca.cfg
send_nsca configuration
.SH AUTHOR
NSCA was written by Ethan Galstad <nagios at nagios.org>.
This manpage was written by sean finney <seanius at debian.org> for
Debian (but it may be freely used by others).
Index: nsca.init
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/debian/nsca.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nsca.init 5 Dec 2005 10:51:00 -0000 1.2
+++ nsca.init 11 Dec 2005 01:39:10 -0000 1.3
@@ -35,7 +35,7 @@
$SSD -K --exec $DAEMON -- $OPTS || die "ERROR: could not stop $NAME."
echo "$NAME."
;;
-restart)
+restart|reload|force-reload)
$0 stop
$0 start
;;
--- NEW FILE: nsca.lintian-overrides ---
# the code in question is wrapped inside a "if which update-inetd" and
# is only there for backwards compatibility at that...
nsca binary: maintainer-script-needs-depends-on-netbase postrm
Index: postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/debian/postinst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postinst 29 Oct 2005 11:38:05 -0000 1.1
+++ postinst 11 Dec 2005 01:39:10 -0000 1.2
@@ -4,12 +4,6 @@
case "$1" in
configure)
-
- chown nagios.root /etc/nsca.cfg /etc/send_nsca.cfg
- chmod 440 /etc/nsca.cfg /etc/send_nsca.cfg
-
- update-inetd --group OTHER --add '5667\t\tstream\ttcp\tnowait\tnagios\t/usr/sbin/tcpd\t/usr/sbin/nsca -c /etc/nsca.cfg --inetd'
- /etc/init.d/inetd reload
;;
abort-upgrade|abort-remove|abort-deconfigure)
exit 0
@@ -20,4 +14,4 @@
;;
esac
-
+#DEBHELPER#
Index: postrm
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/debian/postrm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postrm 29 Oct 2005 11:38:05 -0000 1.1
+++ postrm 11 Dec 2005 01:39:10 -0000 1.2
@@ -1,6 +1,10 @@
#! /bin/sh
if [ "$1" = "purge" ] ; then
- update-inetd --group OTHER --remove '5667\t\tstream\ttcp\tnowait\tnagios\t/usr/sbin/tcpd\t/usr/sbin/nsca -c /etc/nsca.cfg -- inetd'
+ # to remain backwards-compatible with inetd and the like:
+ if which update-inetd >/dev/null 2>&1; then
+ update-inetd --group OTHER --remove '5667\t\tstream\ttcp\tnowait\tnagios\t/usr/sbin/tcpd\t/usr/sbin/nsca -c /etc/nsca.cfg -- inetd' || true
+ fi
fi
+#DEBHELPER#
Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nsca/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rules 5 Dec 2005 10:51:00 -0000 1.3
+++ rules 11 Dec 2005 01:39:10 -0000 1.4
@@ -1,63 +1,68 @@
#!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
-package=nsca
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0 -Wall
+else
+ CFLAGS += -O2 -Wall
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
include /usr/share/dpatch/dpatch.make
-build: patch-stamp
- $(checkdir)
+NSCA=debian/nsca
+SEND_NSCA=debian/nsca
+
+build: build-stamp
+build-stamp: patch-stamp
+ dh_testdir
./configure --with-nsca-user=nagios --with-nsca-grp=nogroup --with-nsca-port=5667 --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib/nagios
$(MAKE) all
- touch build
+ touch build-stamp
clean: unpatch
- $(checkdir)
- -rm -f build
- -$(MAKE) distclean
- -rm -f `find . -name "*~"`
- -rm -rf debian/tmp debian/files* core debian/substvars
-
-binary-indep: checkroot build
- $(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package. If there were any they would be
-# made here.
-
-binary-arch: checkroot build
- $(checkdir)
- -rm -rf debian/tmp
- install -d debian/tmp
- cd debian/tmp && install -d `cat ../dirs`
- $(MAKE) install prefix=`pwd`/debian/tmp/usr
-
- # Copy missing files
- cp src/nsca debian/tmp/usr/sbin
- cp src/send_nsca debian/tmp/usr/sbin
- cp send_nsca.cfg nsca.cfg debian/tmp/etc
- cp debian/nsca.init debian/tmp/etc/init.d/nsca
- chmod a+x debian/tmp/etc/init.d/nsca
-
- # Remove obsolete stuff
- rm -rf tmp/debian/usr/local
-
-# Must have debmake installed for this to work. Otherwise please copy
-# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
- debstd Changelog README
- dpkg-gencontrol -isp
- chown -R root.root debian/tmp
- chmod -R go=rX debian/tmp
- dpkg --build debian/tmp ..
+ dh_testdir
+ dh_testroot
+ if test -f Makefile; then $(MAKE) distclean; fi
+ dh_clean
+ rm -f {build,install}-stamp
-define checkdir
- test -f debian/rules
-endef
+install: install-stamp
+install-stamp: build-stamp
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ dh_installchangelogs Changelog
+ dh_installdocs README
+ dh_installexamples nsca.xinetd
+ dh_installinit -u defaults 30
+ dh_installmanpages debian/nsca.1 debian/send_nsca.1
+ install -D -m 755 src/nsca ${NSCA}/usr/sbin
+ install -D -m 640 nsca.cfg ${NSCA}/etc
+ install -D -m 755 src/send_nsca ${SEND_NSCA}/usr/sbin
+ install -D -m 640 send_nsca.cfg ${SEND_NSCA}/etc
+ install -D -m 644 debian/nsca.lintian-overrides ${NSCA}/usr/share/lintian/overrides/nsca
+ touch install-stamp
binary: binary-indep binary-arch
+binary-indep:
+binary-arch: install-stamp
+ dh_testdir
+ dh_testroot
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
-checkroot:
- $(checkdir)
- test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean install
--- NEW FILE: send_nsca.1 ---
.TH send_nsca "1" "December 2005" "nsca"
.SH NAME
send_nsca \- send passive check results to an NSCA daemon
.SH SYNOPSIS
.B send_nsca \-H <host_address> [\-p port] [\-to to_sec] [\-d delim] [ \-c config_file]
.br
.Xc
.SH DESCRIPTION
.B send_nsca
This utility is used to send passive check results to the NSCA daemon.
Host and Service check data that is to be sent to the NSCA daemon is
read from standard input. Input should be provided in the following
format (tab\-delimited unless overriden with \-d command line argument,
one entry per line):
.TP
Service Checks
<host_name>[tab]<svc_description>[tab]<return_code>[tab]<plugin_output>[newline]
.TP
Host Checks:
<host_name>[tab]<return_code>[tab]<plugin_output>[newline]
.SH OPTIONS
.TP
host_address
The IP address of the host running the NSCA daemon
.TP
port
The port on which the daemon is running \- default is 5667
.TP
to_sec
Number of seconds before connection attempt times out. (default timeout is 10 seconds)
.TP
delim
Delimiter to use when parsing input (defaults to a tab)
.TP
config_file
Name of config file to use
.SH SEE ALSO
.TP
nsca(1)
.SH FILES
.TP
/etc/nsca.cfg
nsca server configuration
.TP
/etc/send_nsca.cfg
send_nsca configuration
.SH AUTHOR
NSCA was written by Ethan Galstad <nagios at nagios.org>.
This manpage was written by sean finney <seanius at debian.org> for
Debian (but it may be freely used by others).
More information about the Pkg-nagios-changes
mailing list