summaryrefslogtreecommitdiff
path: root/tools/qmail
diff options
context:
space:
mode:
authorroot <root@cloud.av8n.net>2012-07-13 04:13:27 (GMT)
committerJohn Denker <jsd@av8n.com>2012-07-14 01:39:51 (GMT)
commit1ead9453f3dfc28cf797aafbcc7b6e56b69c4770 (patch)
treea76f20fe218e0ea827cced78acd523686ec826f9 /tools/qmail
parent86ce735baf5d85245f6fae24235f35820a0a1a7b (diff)
small improvements
Diffstat (limited to 'tools/qmail')
-rwxr-xr-xtools/qmail8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/qmail b/tools/qmail
index 73a872c..f58a5c7 100755
--- a/tools/qmail
+++ b/tools/qmail
@@ -16,6 +16,8 @@ nofiles=$(id -g qmaild )
filters=/var/qmail/control/filters.conf
smtpconf=/etc/stunnel/smtp.conf
pop3conf=/etc/stunnel/pop3.conf
+PEM=/etc/stunnel/stunnel.pem
+CDB=/etc/tcpserver/smtp.cdb
## Plain smtp never asks for a password,
## and will not relay except from inside the firewall.
@@ -159,8 +161,7 @@ case "$verb" in
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 \
+ $tcps -R -x$CDB -u$qmaild -g$nofiles $mailhost smtp \
qmail-smtpd 2>&1 \
| splogger smtp &
proc_ok $proc
@@ -247,11 +248,12 @@ case "$verb" in
fi
done
for file in $pop3conf $smtpconf $filters \
- /etc/tcpserver/smtp.cdb ; do
+ $CDB $PEM ; do
if ! test -r "$file" ; then
echo "Beware: file '$file' is missing."
fi
done
+ /var/qmail/bin/qmail-tls-check_certs -server
;;
*)
echo "Usage: $0 {start|stop|reload|zap|restart|status}"