Merge pull request tiredofit#158 from hobbit378/15

FIXED: 'socat' starts even if 'localhost' or '127.0.0.1' is selected as SMTP_HOST
alenas · Aug 14, 2020 · 5e2f6e7 · 5e2f6e7
2 parents f469987 + 1dd513a
commit 5e2f6e7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/install/etc/cont-init.d/15-socat b/install/etc/cont-init.d/15-socat
@@ -5,7 +5,7 @@ prepare_service single
 # shellcheck disable=SC2034
 PROCESS_NAME="socat"
 
-if [ "$SMTP_HOST" != "localhost" ] || [ "$SMTP_HOST" != "127.0.0.1" ] || [ "$SMTP_PORT" != 25 ] && var_true "$ENABLE_SMTP" ; then
+if  [ "$SMTP_HOST" != "localhost" -a "$SMTP_HOST" != "127.0.0.1" -o "$SMTP_PORT" != 25 ] && var_true "$ENABLE_SMTP" ; then
  print_notice "Custom SMTP relay detected, enabling proxy"
  service_start 15-socat
 else