github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1226 from erik-wramner/fix_dovecot_respawning

Browse source 
Fixed bug when dh.pem/dhparam.pem exists with ONE_DIR. The tests passed in my fork, so I'll merge this at once to get it out before more people run into problems.
This commit is contained in:
Erik Wramner 2019-08-13 07:49:29 +02:00 committed by GitHub
parent 5ebb8614a2 615a845d6c
commit fbba6beaf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/start-mailserver.sh
View file

@ -1261,7 +1261,7 @@ function _setup_postfix_dhparam() {
fi fi
# Copy from the state directory to the working location # Copy from the state directory to the working location
rm /etc/postfix/dhparams.pem && cp $DHPARAMS_FILE /etc/postfix/dhparams.pem rm -f /etc/postfix/dhparams.pem && cp $DHPARAMS_FILE /etc/postfix/dhparams.pem
else else
if [ ! -f /etc/postfix/dhparams.pem ]; then if [ ! -f /etc/postfix/dhparams.pem ]; then
if [ -f /etc/dovecot/dh.pem ]; then if [ -f /etc/dovecot/dh.pem ]; then
@ -1293,7 +1293,7 @@ function _setup_dovecot_dhparam() {
fi fi
# Copy from the state directory to the working location # Copy from the state directory to the working location
rm /etc/dovecot/dh.pem && cp $DHPARAMS_FILE /etc/dovecot/dh.pem rm -f /etc/dovecot/dh.pem && cp $DHPARAMS_FILE /etc/dovecot/dh.pem
else else
if [ ! -f /etc/dovecot/dh.pem ]; then if [ ! -f /etc/dovecot/dh.pem ]; then
if [ -f /etc/postfix/dhparams.pem ]; then if [ -f /etc/postfix/dhparams.pem ]; then