diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/daemontools/DEINSTALL | 13 | ||||
| -rw-r--r-- | sysutils/daemontools/DESCR | 15 | ||||
| -rw-r--r-- | sysutils/daemontools/Makefile | 21 | ||||
| -rw-r--r-- | sysutils/daemontools/PLIST | 4 | ||||
| -rw-r--r-- | sysutils/daemontools/files/svscan.sh.sample | 34 |
5 files changed, 16 insertions, 71 deletions
diff --git a/sysutils/daemontools/DEINSTALL b/sysutils/daemontools/DEINSTALL deleted file mode 100644 index a09d50a4f97..00000000000 --- a/sysutils/daemontools/DEINSTALL +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: DEINSTALL,v 1.2 2004/05/02 17:50:05 xtraeme Exp $ - -case "$2" in - DEINSTALL) rmdir 2>/dev/null @@SERVICEDIR@@ || cat <<EOF - -============================================================= -Your service directory @@SERVICEDIR@@ was not removed. -If you no longer need it, remove it by hand. -============================================================= - -EOF - ;; -esac diff --git a/sysutils/daemontools/DESCR b/sysutils/daemontools/DESCR index ef8ef5ac5f3..7a959528e89 100644 --- a/sysutils/daemontools/DESCR +++ b/sysutils/daemontools/DESCR @@ -1,3 +1,12 @@ -Daemontools is a small set of /very/ useful utilities, from Dan -Bernstein. They are mainly used for controlling processes, and -maintaining logfiles. +daemontools is a collection of tools for managing UNIX services. + +supervise monitors a service. It starts the service and restarts +the service if it dies. Setting up a new service is easy: all +supervise needs is a directory with a run script that runs the +service. + +multilog saves error messages to one or more logs. It optionally +timestamps each line and, for each log, includes or excludes lines +matching specified patterns. It automatically rotates logs to limit +the amount of disk space used. If the disk fills up, it pauses and +tries again, without losing any data. diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index 876fd5cf753..0107526e277 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.26 2006/01/13 18:01:52 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2006/01/14 07:00:30 schmonz Exp $ DISTNAME= daemontools-0.76 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://cr.yp.to/daemontools/ ftp://cr.yp.to/daemontools/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES} @@ -19,24 +20,12 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/admin/${DISTNAME} DJB_SLASHPACKAGE= YES -SAMPLERC= svscan.sh.sample -SERVICEDIR?= ${VARBASE}/spool/service CMDDIR= ${WRKSRC}/command -PLIST_SUBST+= SERVICEDIR=${SERVICEDIR:Q} -DEINSTALL_FILE= ${WRKDIR}/.DEINSTALL - -INSTALLATION_DIRS= bin man man/man8 share/examples/daemontools +INSTALLATION_DIRS= bin man man/man8 SUBST_FILES.djbware+= src/error.h -post-build: - ${SED} -e "s,@@PREFIX@@,${PREFIX}," \ - -e "s,@@SERVICEDIR@@,${SERVICEDIR},g" \ - ${FILESDIR}/${SAMPLERC} > ${WRKDIR}/${SAMPLERC} - ${SED} "s,@@SERVICEDIR@@,${SERVICEDIR},g" \ - ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - do-install: (while read cmd; do \ if ${FILE_CMD} ${CMDDIR}/$$cmd | ${EGREP} "(executable .* script|shell script|text)" >/dev/null 2>&1; then \ @@ -47,10 +36,6 @@ do-install: done) < ${WRKSRC}/package/commands post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/daemontools - ${INSTALL_DATA} ${WRKDIR}/${SAMPLERC} \ - ${PREFIX}/share/examples/daemontools - ${INSTALL_DATA_DIR} ${SERVICEDIR} cd ${WRKDIR}/*-man; for i in 8; do \ for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/man/man$$i; done \ done diff --git a/sysutils/daemontools/PLIST b/sysutils/daemontools/PLIST index 526143f4b22..c2e43d16f24 100644 --- a/sysutils/daemontools/PLIST +++ b/sysutils/daemontools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2004/05/02 17:50:05 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.5 2006/01/14 07:00:30 schmonz Exp $ bin/envdir bin/envuidgid bin/fghack @@ -33,5 +33,3 @@ man/man8/svscanboot.8 man/man8/svstat.8 man/man8/tai64n.8 man/man8/tai64nlocal.8 -share/examples/daemontools/svscan.sh.sample -@dirrm share/examples/daemontools diff --git a/sysutils/daemontools/files/svscan.sh.sample b/sysutils/daemontools/files/svscan.sh.sample deleted file mode 100644 index 7060aafd3ad..00000000000 --- a/sysutils/daemontools/files/svscan.sh.sample +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -# Surely advice you to enable some of the below -# control variables and the apropriate ulimit. -# These are only examples. -# Furthermore, you should think about additional -# limits you might need. -# Or, check login.conf(5) for a suitable -# alternative -# -# I really do suggest you use @@SERVICEDIR@@ as your -# service spool directory. Check hier(7) for -# reasons. - -# 10 Mb -#MINSEGMENT=10240 -# 20 Mb -#MAXSEGMENT=20480 -# 10 Mb -#MAXFILESIZE=10240 -# 100 -#MAXFD=100 -# 40 -#MAXCHILD=40 - -# ulimits -#ulimit -d ${MINSEGMENT} -#ulimit -f ${MAXFILESIZE} -#ulimit -m ${MAXSEGMENT} -#ulimit -n ${MAXFD} -#ulimit -s ${MINSEGMENT} -#ulimit -u ${MAXCHILD} - -exec /bin/csh -cf '@@PREFIX@@/bin/svscan @@SERVICEDIR@@ &' |