diff options
Diffstat (limited to 'tools/qmail')
| -rwxr-xr-x | tools/qmail | 8 |
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}" |