summaryrefslogtreecommitdiff
path: root/tools/qmail
diff options
context:
space:
mode:
authorJohn Denker <jsd@av8n.com>2012-06-03 07:00:54 (GMT)
committerJohn Denker <jsd@av8n.com>2012-06-03 07:00:54 (GMT)
commite866b3e47fe92eafc9d6d40a579993c8919b9842 (patch)
tree4d3b3723b4a554cb0870b57ed1aae8ec1eb0f028 /tools/qmail
parentcbf5fd559293f7f5b59996a5845c0080e9946f01 (diff)
pass config-file in environment, since can't pass it as arg
Diffstat (limited to 'tools/qmail')
-rwxr-xr-xtools/qmail14
1 files changed, 10 insertions, 4 deletions
diff --git a/tools/qmail b/tools/qmail
index e49ac96..73a872c 100755
--- a/tools/qmail
+++ b/tools/qmail
@@ -12,6 +12,8 @@ tcps=$( which tcpserver )
qmaild=$(id -u qmaild )
nofiles=$(id -g qmaild )
+
+filters=/var/qmail/control/filters.conf
smtpconf=/etc/stunnel/smtp.conf
pop3conf=/etc/stunnel/pop3.conf
@@ -154,7 +156,8 @@ case "$verb" in
else
echo -n " SMTP-server "
/bin/rm -f /var/run/$proc.pid
- QMAILQUEUE="/var/qmail/bin/hi-q asdf/var/qmail/control/filters.conf" \
+ HI_Q_CONF="$filters" \
+ QMAILQUEUE="/var/qmail/bin/hi-q" \
$PIDO /var/run/$proc.pid \
$tcps -R -x/etc/tcpserver/smtp.cdb \
-u$qmaild -g$nofiles $mailhost smtp \
@@ -243,9 +246,12 @@ case "$verb" in
echo " down. $pid"
fi
done
- if ! test -r '/etc/tcpserver/smtp.cdb' ; then
- echo "Beware: /etc/tcpserver/smtp.cdb is missing."
- fi
+ for file in $pop3conf $smtpconf $filters \
+ /etc/tcpserver/smtp.cdb ; do
+ if ! test -r "$file" ; then
+ echo "Beware: file '$file' is missing."
+ fi
+ done
;;
*)
echo "Usage: $0 {start|stop|reload|zap|restart|status}"