Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Friendica: 'auth' parameter from SMTP_AUTH env #10040

Merged
merged 1 commit into from
Apr 26, 2021
Merged

Friendica: 'auth' parameter from SMTP_AUTH env #10040

merged 1 commit into from
Apr 26, 2021

Conversation

nupplaphil
Copy link
Contributor

No description provided.

@nupplaphil nupplaphil mentioned this pull request Apr 24, 2021
Merged
@github-actions
Copy link

Diff for 9d17872: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 70733d9..7536cb0 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,60 +3,60 @@ GitRepo: https://github.com/friendica/docker.git
 
 Tags: 2020.09-apache, 2020.09
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2020.09/apache
 
 Tags: 2020.09-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2020.09/fpm
 
 Tags: 2020.09-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2020.09/fpm-alpine
 
 Tags: 2021.01-apache, apache, stable-apache, 2021.01, latest, stable
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2021.01/apache
 
 Tags: 2021.01-fpm, fpm, stable-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2021.01/fpm
 
 Tags: 2021.01-fpm-alpine, fpm-alpine, stable-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2021.01/fpm-alpine
 
 Tags: 2021.03-dev-apache, dev-apache, 2021.03-dev, dev
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2021.03-dev/apache
 
 Tags: 2021.03-dev-fpm, dev-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2021.03-dev/fpm
 
 Tags: 2021.03-dev-fpm-alpine, dev-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2021.03-dev/fpm-alpine
 
 Tags: 2021.03-rc-apache, rc-apache, 2021.03-rc, rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2021.03-rc/apache
 
 Tags: 2021.03-rc-fpm, rc-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2021.03-rc/fpm
 
 Tags: 2021.03-rc-fpm-alpine, rc-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 969e173e59471789f1376c952693654aa7e8176e
+GitCommit: 88db303a9ad22024d505b28390af384e28a5a624
 Directory: 2021.03-rc/fpm-alpine
diff --git a/friendica_2020.09-fpm-alpine/setup_msmtp.sh b/friendica_2020.09-fpm-alpine/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_2020.09-fpm-alpine/setup_msmtp.sh
+++ b/friendica_2020.09-fpm-alpine/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/friendica_2020.09-fpm/setup_msmtp.sh b/friendica_2020.09-fpm/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_2020.09-fpm/setup_msmtp.sh
+++ b/friendica_2020.09-fpm/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/friendica_2020.09/setup_msmtp.sh b/friendica_2020.09/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_2020.09/setup_msmtp.sh
+++ b/friendica_2020.09/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/friendica_dev-fpm-alpine/setup_msmtp.sh b/friendica_dev-fpm-alpine/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_dev-fpm-alpine/setup_msmtp.sh
+++ b/friendica_dev-fpm-alpine/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/friendica_dev-fpm/setup_msmtp.sh b/friendica_dev-fpm/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_dev-fpm/setup_msmtp.sh
+++ b/friendica_dev-fpm/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/friendica_dev/setup_msmtp.sh b/friendica_dev/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_dev/setup_msmtp.sh
+++ b/friendica_dev/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/friendica_rc-fpm-alpine/setup_msmtp.sh b/friendica_rc-fpm-alpine/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_rc-fpm-alpine/setup_msmtp.sh
+++ b/friendica_rc-fpm-alpine/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/friendica_rc-fpm/setup_msmtp.sh b/friendica_rc-fpm/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_rc-fpm/setup_msmtp.sh
+++ b/friendica_rc-fpm/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/friendica_rc/setup_msmtp.sh b/friendica_rc/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_rc/setup_msmtp.sh
+++ b/friendica_rc/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/friendica_stable-fpm-alpine/setup_msmtp.sh b/friendica_stable-fpm-alpine/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_stable-fpm-alpine/setup_msmtp.sh
+++ b/friendica_stable-fpm-alpine/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/friendica_stable-fpm/setup_msmtp.sh b/friendica_stable-fpm/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_stable-fpm/setup_msmtp.sh
+++ b/friendica_stable-fpm/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/friendica_stable/setup_msmtp.sh b/friendica_stable/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/friendica_stable/setup_msmtp.sh
+++ b/friendica_stable/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"

@yosifkit yosifkit merged commit b7db6cb into docker-library:master Apr 26, 2021
@nupplaphil nupplaphil deleted the friendica branch April 26, 2021 21:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/friendica
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nupplaphil @yosifkit