From bf8001e884d4e9305133730e8c22d34db13d48e3 Mon Sep 17 00:00:00 2001 From: Moritz Schlarb Date: Mon, 26 Aug 2024 15:50:51 +0200 Subject: [PATCH] Fix: Correctly use test conditions in .docker/setup-mta.sh Added dollar signs to have the tests actually look at variable values and not for the plain strings which leads to them being always true! --- .docker/setup-mta.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.docker/setup-mta.sh b/.docker/setup-mta.sh index 51aaa00ea..e27d763f1 100644 --- a/.docker/setup-mta.sh +++ b/.docker/setup-mta.sh @@ -1,19 +1,19 @@ #!/bin/bash # Make any changes only when MTA_HOST has been set -if [ -n MTA_HOST ]; then +if [ -n "$MTA_HOST" ]; then echo "setting up configuration file for mail agent" CONFIG="/etc/msmtprc" echo "host $MTA_HOST" > $CONFIG - [ -n MTA_PORT ] && echo "port $MTA_PORT" >> $CONFIG - [ -n MTA_TLS ] && echo "tls $MTA_TLS" >> $CONFIG - [ -n MTA_STARTTLS ] && echo "tls_starttls $MTA_STARTTLS" >> $CONFIG - [ -n MTA_TLS_CERTCHECK ] && echo "tls_certcheck $MTA_TLS_CERTCHECK" >> $CONFIG - [ -n MTA_AUTH ] && echo "auth $MTA_AUTH" >> $CONFIG - [ -n MTA_USER ] && echo "user $MTA_USER" >> $CONFIG - [ -n MTA_FROM ] && echo "from $MTA_FROM" >> $CONFIG - [ -n MTA_PASSWORD ] && echo "password $MTA_PASSWORD" >> $CONFIG - [ -n MTA_LOGFILE ] && echo "logfile $MTA_LOGFILE" >> $CONFIG + [ -n "$MTA_PORT" ] && echo "port $MTA_PORT" >> $CONFIG + [ -n "$MTA_TLS" ] && echo "tls $MTA_TLS" >> $CONFIG + [ -n "$MTA_STARTTLS" ] && echo "tls_starttls $MTA_STARTTLS" >> $CONFIG + [ -n "$MTA_TLS_CERTCHECK" ] && echo "tls_certcheck $MTA_TLS_CERTCHECK" >> $CONFIG + [ -n "$MTA_AUTH" ] && echo "auth $MTA_AUTH" >> $CONFIG + [ -n "$MTA_USER" ] && echo "user $MTA_USER" >> $CONFIG + [ -n "$MTA_FROM" ] && echo "from $MTA_FROM" >> $CONFIG + [ -n "$MTA_PASSWORD" ] && echo "password $MTA_PASSWORD" >> $CONFIG + [ -n "$MTA_LOGFILE" ] && echo "logfile $MTA_LOGFILE" >> $CONFIG chown gvmd:mail $CONFIG chmod 750 $CONFIG fi