From 25c283dc15d61ce64de6bd01715f9dc57243a590 Mon Sep 17 00:00:00 2001 From: schmonz Date: Fri, 15 Apr 2005 05:17:01 +0000 Subject: Update to 20050415. Changes: * Add "foo_log" booleans to enable or disable logging (enabled by default). * Always run loggers as the "qmaill" user. This makes it simpler to define alternate loggers. --- mail/qmail-run/Makefile | 4 ++-- mail/qmail-run/files/qmailpop3d.sh | 13 +++++++++---- mail/qmail-run/files/qmailqread.sh | 11 ++++++++--- mail/qmail-run/files/qmailsend.sh | 7 ++++++- mail/qmail-run/files/qmailsmtpd.sh | 13 +++++++++---- 5 files changed, 34 insertions(+), 14 deletions(-) (limited to 'mail/qmail-run') diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile index 7404957d3e0..023810a4b43 100644 --- a/mail/qmail-run/Makefile +++ b/mail/qmail-run/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2005/03/30 20:06:20 schmonz Exp $ +# $NetBSD: Makefile,v 1.9 2005/04/15 05:17:01 schmonz Exp $ # -DISTNAME= qmail-run-20050330 +DISTNAME= qmail-run-20050415 CATEGORIES= mail MASTER_SITES= # empty DISTFILES= # empty diff --git a/mail/qmail-run/files/qmailpop3d.sh b/mail/qmail-run/files/qmailpop3d.sh index 8baec47125c..4c4cc971388 100644 --- a/mail/qmail-run/files/qmailpop3d.sh +++ b/mail/qmail-run/files/qmailpop3d.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailpop3d.sh,v 1.5 2005/03/30 20:06:20 schmonz Exp $ +# $NetBSD: qmailpop3d.sh,v 1.6 2005/04/15 05:17:02 schmonz Exp $ # # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs). # @@ -11,7 +11,7 @@ name="qmailpop3d" # User-settable rc.conf variables and their default values: : ${qmailpop3d_postenv:=""} -: ${qmailpop3d_tcpflags:="-v -R -H -l 0"} +: ${qmailpop3d_tcpflags:="-vRHl0"} : ${qmailpop3d_tcphost:="0"} : ${qmailpop3d_tcpport:="110"} : ${qmailpop3d_datalimit:="2000000"} @@ -19,7 +19,9 @@ name="qmailpop3d" : ${qmailpop3d_prepop3d:=""} : ${qmailpop3d_checkpassword:="@LOCALBASE@/bin/checkpassword"} : ${qmailpop3d_maildirname:="Maildir"} -: ${qmailpop3d_logcmd:="@LOCALBASE@/bin/setuidgid qmaill logger -t nb${name} -p mail.info"} +: ${qmailpop3d_log:="YES"} +: ${qmailpop3d_logcmd:="logger -t nb${name} -p mail.info"} +: ${qmailpop3d_nologcmd:="@LOCALBASE@/bin/multilog -*"} if [ -f /etc/rc.subr ]; then . /etc/rc.subr @@ -43,7 +45,10 @@ qmailpop3d_precmd() # tcpserver(1) is akin to inetd(8), but runs one service per process. # We want to signal only the tcpserver process responsible for POP # service. Use argv0(1) to set procname to "qmailpop3d". - command="@SETENV@ - ${qmailpop3d_postenv} @LOCALBASE@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3` ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @LOCALBASE@/bin/qmail-popup `@HEAD@ -1 @PKG_SYSCONFDIR@/control/me` ${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} @LOCALBASE@/bin/qmail-pop3d ${qmailpop3d_maildirname} 2>&1 | ${qmailpop3d_logcmd}" + if [ -f /etc/rc.subr ]; then + checkyesno qmailpop3d_log || qmailpop3d_logcmd=${qmailpop3d_nologcmd} + fi + command="@SETENV@ - ${qmailpop3d_postenv} @LOCALBASE@/bin/softlimit -m ${qmailpop3d_datalimit} ${qmailpop3d_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3` ${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @LOCALBASE@/bin/qmail-popup `@HEAD@ -1 @PKG_SYSCONFDIR@/control/me` ${qmailpop3d_checkpassword} ${qmailpop3d_prepop3d} @LOCALBASE@/bin/qmail-pop3d ${qmailpop3d_maildirname} 2>&1 | @LOCALBASE@/bin/setuidgid qmaill ${qmailpop3d_logcmd}" command_args="&" rc_flags="" } diff --git a/mail/qmail-run/files/qmailqread.sh b/mail/qmail-run/files/qmailqread.sh index 9e89498287a..cdcb050b2c8 100644 --- a/mail/qmail-run/files/qmailqread.sh +++ b/mail/qmail-run/files/qmailqread.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailqread.sh,v 1.5 2005/03/30 20:06:20 schmonz Exp $ +# $NetBSD: qmailqread.sh,v 1.6 2005/04/15 05:17:02 schmonz Exp $ # # @PKGNAME@ script to control a service providing local non-root # users access to see the queue. Adapted from a script by Steinar Haug. @@ -12,7 +12,9 @@ name="qmailqread" # User-settable rc.conf variables and their default values: -: ${qmailqread_logcmd:="@LOCALBASE@/bin/setuidgid qmaill logger -t nb${name} -p mail.info"} +: ${qmailqread_log:="YES"} +: ${qmailqread_logcmd:="logger -t nb${name} -p mail.info"} +: ${qmailqread_nologcmd:="@LOCALBASE@/bin/multilog -*"} if [ -f /etc/rc.subr ]; then . /etc/rc.subr @@ -25,7 +27,10 @@ start_precmd="qmailqread_precmd" qmailqread_precmd() { - command="@SETENV@ - @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} -R -1 -u `@ID@ -u qmails` -g `@ID@ -g qmails` 127.0.0.1 20025 @LOCALBASE@/bin/qmail-qread 2>&1 | ${qmailqread_logcmd}" + if [ -f /etc/rc.subr ]; then + checkyesno qmailqread_log || qmailqread_logcmd=${qmailqread_nologcmd} + fi + command="@SETENV@ - @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} -R -1 -u `@ID@ -u qmails` -g `@ID@ -g qmails` 127.0.0.1 20025 @LOCALBASE@/bin/qmail-qread 2>&1 | @LOCALBASE@/bin/setuidgid qmaill ${qmailqread_logcmd}" command_args="&" rc_flags="" } diff --git a/mail/qmail-run/files/qmailsend.sh b/mail/qmail-run/files/qmailsend.sh index c7ba3efb60e..d3d3656ba94 100644 --- a/mail/qmail-run/files/qmailsend.sh +++ b/mail/qmail-run/files/qmailsend.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailsend.sh,v 1.5 2005/03/30 20:06:20 schmonz Exp $ +# $NetBSD: qmailsend.sh,v 1.6 2005/04/15 05:17:02 schmonz Exp $ # # @PKGNAME@ script to control qmail-send (local and outgoing mail). # @@ -14,7 +14,9 @@ name="qmailsend" # User-settable rc.conf variables and their default values: : ${qmailsend_postenv:="PATH=@LOCALBASE@/bin:$PATH"} : ${qmailsend_defaultdelivery:="`@HEAD@ -1 @PKG_SYSCONFDIR@/control/defaultdelivery`"} +: ${qmailsend_log:="YES"} : ${qmailsend_logcmd:="logger -t nb${name} -p mail.info"} +: ${qmailsend_nologcmd:="@LOCALBASE@/bin/multilog -*"} if [ -f /etc/rc.subr ]; then . /etc/rc.subr @@ -39,6 +41,9 @@ qmailsend_precmd() { # qmail-start(8) starts the various qmail processes, then exits. # qmail-send(8) is the process we want to signal later. + if [ -f /etc/rc.subr ]; then + checkyesno qmailsend_log || qmailsend_logcmd=${qmailsend_nologcmd} + fi command="@SETENV@ - ${qmailsend_postenv} qmail-start '$qmailsend_defaultdelivery' ${qmailsend_logcmd}" command_args="&" rc_flags="" diff --git a/mail/qmail-run/files/qmailsmtpd.sh b/mail/qmail-run/files/qmailsmtpd.sh index 3cd933f24f2..da100133c8a 100644 --- a/mail/qmail-run/files/qmailsmtpd.sh +++ b/mail/qmail-run/files/qmailsmtpd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailsmtpd.sh,v 1.5 2005/03/30 20:06:20 schmonz Exp $ +# $NetBSD: qmailsmtpd.sh,v 1.6 2005/04/15 05:17:02 schmonz Exp $ # # @PKGNAME@ script to control qmail-smtpd (SMTP service). # @@ -12,14 +12,16 @@ name="qmailsmtpd" # User-settable rc.conf variables and their default values: : ${qmailsmtpd_postenv:="QMAILQUEUE=@LOCALBASE@/bin/qmail-queue"} -: ${qmailsmtpd_tcpflags:="-v -R -l 0"} +: ${qmailsmtpd_tcpflags:="-vRl0"} : ${qmailsmtpd_tcphost:="0"} : ${qmailsmtpd_tcpport:="25"} : ${qmailsmtpd_datalimit:="2000000"} : ${qmailsmtpd_pretcpserver:=""} : ${qmailsmtpd_presmtpd:=""} : ${qmailsmtpd_postsmtpd:=""} -: ${qmailsmtpd_logcmd:="@LOCALBASE@/bin/setuidgid qmaill logger -t nb${name} -p mail.info"} +: ${qmailsmtpd_log:="YES"} +: ${qmailsmtpd_logcmd:="logger -t nb${name} -p mail.info"} +: ${qmailsmtpd_nologcmd:="@LOCALBASE@/bin/multilog -*"} if [ -f /etc/rc.subr ]; then . /etc/rc.subr @@ -43,7 +45,10 @@ qmailsmtpd_precmd() # tcpserver(1) is akin to inetd(8), but runs one service per process. # We want to signal only the tcpserver process responsible for SMTP # service. Use argv0(1) to set procname to "qmailsmtpd". - command="@SETENV@ - ${qmailsmtpd_postenv} @LOCALBASE@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${qmailsmtpd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.smtp.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming` -u `@ID@ -u qmaild` -g `@ID@ -g qmaild` ${qmailsmtpd_tcphost} ${qmailsmtpd_tcpport} ${qmailsmtpd_presmtpd} @LOCALBASE@/bin/qmail-smtpd ${qmailsmtpd_postsmtpd} 2>&1 | ${qmailsmtpd_logcmd}" + if [ -f /etc/rc.subr ]; then + checkyesno qmailsmtpd_log || qmailsmtpd_logcmd=${qmailsmtpd_nologcmd} + fi + command="@SETENV@ - ${qmailsmtpd_postenv} @LOCALBASE@/bin/softlimit -m ${qmailsmtpd_datalimit} ${qmailsmtpd_pretcpserver} @LOCALBASE@/bin/argv0 @LOCALBASE@/bin/tcpserver ${name} ${qmailsmtpd_tcpflags} -x @PKG_SYSCONFDIR@/tcp.smtp.cdb -c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencyincoming` -u `@ID@ -u qmaild` -g `@ID@ -g qmaild` ${qmailsmtpd_tcphost} ${qmailsmtpd_tcpport} ${qmailsmtpd_presmtpd} @LOCALBASE@/bin/qmail-smtpd ${qmailsmtpd_postsmtpd} 2>&1 | @LOCALBASE@/bin/setuidgid qmaill ${qmailsmtpd_logcmd}" command_args="&" rc_flags="" } -- cgit v1.2.3