From 88db303a9ad22024d505b28390af384e28a5a624 Mon Sep 17 00:00:00 2001 From: miklobit Date: Wed, 14 Apr 2021 03:31:12 +0000 Subject: [PATCH 1/4] set /etc/msmtprc 'auth' parameter from SMTP_AUTH env --- 2020.09/apache/setup_msmtp.sh | 3 ++- 2020.09/fpm-alpine/setup_msmtp.sh | 3 ++- 2020.09/fpm/setup_msmtp.sh | 3 ++- 2021.01/apache/setup_msmtp.sh | 3 ++- 2021.01/fpm-alpine/setup_msmtp.sh | 3 ++- 2021.01/fpm/setup_msmtp.sh | 3 ++- 2021.03-dev/apache/setup_msmtp.sh | 3 ++- 2021.03-dev/fpm-alpine/setup_msmtp.sh | 3 ++- 2021.03-dev/fpm/setup_msmtp.sh | 3 ++- 2021.03-rc/apache/setup_msmtp.sh | 3 ++- 2021.03-rc/fpm-alpine/setup_msmtp.sh | 3 ++- 2021.03-rc/fpm/setup_msmtp.sh | 3 ++- docker-setup_msmtp.sh | 3 ++- 13 files changed, 26 insertions(+), 13 deletions(-) diff --git a/2020.09/apache/setup_msmtp.sh b/2020.09/apache/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2020.09/apache/setup_msmtp.sh +++ b/2020.09/apache/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/2020.09/fpm-alpine/setup_msmtp.sh b/2020.09/fpm-alpine/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2020.09/fpm-alpine/setup_msmtp.sh +++ b/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/2020.09/fpm/setup_msmtp.sh b/2020.09/fpm/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2020.09/fpm/setup_msmtp.sh +++ b/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/2021.01/apache/setup_msmtp.sh b/2021.01/apache/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2021.01/apache/setup_msmtp.sh +++ b/2021.01/apache/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/2021.01/fpm-alpine/setup_msmtp.sh b/2021.01/fpm-alpine/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2021.01/fpm-alpine/setup_msmtp.sh +++ b/2021.01/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/2021.01/fpm/setup_msmtp.sh b/2021.01/fpm/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2021.01/fpm/setup_msmtp.sh +++ b/2021.01/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/2021.03-dev/apache/setup_msmtp.sh b/2021.03-dev/apache/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2021.03-dev/apache/setup_msmtp.sh +++ b/2021.03-dev/apache/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/2021.03-dev/fpm-alpine/setup_msmtp.sh b/2021.03-dev/fpm-alpine/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2021.03-dev/fpm-alpine/setup_msmtp.sh +++ b/2021.03-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/2021.03-dev/fpm/setup_msmtp.sh b/2021.03-dev/fpm/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2021.03-dev/fpm/setup_msmtp.sh +++ b/2021.03-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/2021.03-rc/apache/setup_msmtp.sh b/2021.03-rc/apache/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2021.03-rc/apache/setup_msmtp.sh +++ b/2021.03-rc/apache/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/2021.03-rc/fpm-alpine/setup_msmtp.sh b/2021.03-rc/fpm-alpine/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2021.03-rc/fpm-alpine/setup_msmtp.sh +++ b/2021.03-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/2021.03-rc/fpm/setup_msmtp.sh b/2021.03-rc/fpm/setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/2021.03-rc/fpm/setup_msmtp.sh +++ b/2021.03-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/docker-setup_msmtp.sh b/docker-setup_msmtp.sh index b2e22f0..b90c42c 100644 --- a/docker-setup_msmtp.sh +++ b/docker-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" From 26ea673970bc963639fa846d75db633cda67bbca Mon Sep 17 00:00:00 2001 From: miklobit Date: Wed, 14 Apr 2021 10:34:30 +0000 Subject: [PATCH 2/4] add SMTP_AUTH env in mail settings --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 84452a3..41e8f7c 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,7 @@ The following environment variables are possible for the SMTP examples. - `SMTP_FROM` Sender user-part of the address. (Default: `no-reply` - e.g. no-reply@friendica.local) - `SMTP_TLS` Use TLS for connecting the SMTP Mail-Gateway. (Default: empty) - `SMTP_STARTTLS` Use STARTTLS for connecting the SMTP Mail-Gateway. (Default: empty) +- `SMTP_AUTH` Auth mode for the SMTP Mail-Gateway. (Default: `On`) - `SMTP_AUTH_USER` Username for the SMTP Mail-Gateway. (Default: empty) - `SMTP_AUTH_PASS` Password for the SMTP Mail-Gateway. (Default: empty) From 130b27023008bb8df58c455488f21b75d6dcd4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20K=C5=82osowicz?= Date: Wed, 14 Apr 2021 12:41:01 +0200 Subject: [PATCH 3/4] add SMTP_AUTH env in mail settings --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41e8f7c..f8407b7 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ The following environment variables are possible for the SMTP examples. - `SMTP_FROM` Sender user-part of the address. (Default: `no-reply` - e.g. no-reply@friendica.local) - `SMTP_TLS` Use TLS for connecting the SMTP Mail-Gateway. (Default: empty) - `SMTP_STARTTLS` Use STARTTLS for connecting the SMTP Mail-Gateway. (Default: empty) -- `SMTP_AUTH` Auth mode for the SMTP Mail-Gateway. (Default: `On`) +- `SMTP_AUTH` Auth mode for the SMTP Mail-Gateway. (Default: `On`) - `SMTP_AUTH_USER` Username for the SMTP Mail-Gateway. (Default: empty) - `SMTP_AUTH_PASS` Password for the SMTP Mail-Gateway. (Default: empty) From f46c84e90a3b734d89cb94ca8e4e5e8eb34cc7f8 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 17 Apr 2021 13:16:36 +0200 Subject: [PATCH 4/4] Fix indentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f8407b7..9268484 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ The following environment variables are possible for the SMTP examples. - `SMTP_FROM` Sender user-part of the address. (Default: `no-reply` - e.g. no-reply@friendica.local) - `SMTP_TLS` Use TLS for connecting the SMTP Mail-Gateway. (Default: empty) - `SMTP_STARTTLS` Use STARTTLS for connecting the SMTP Mail-Gateway. (Default: empty) -- `SMTP_AUTH` Auth mode for the SMTP Mail-Gateway. (Default: `On`) +- `SMTP_AUTH` Auth mode for the SMTP Mail-Gateway. (Default: `On`) - `SMTP_AUTH_USER` Username for the SMTP Mail-Gateway. (Default: empty) - `SMTP_AUTH_PASS` Password for the SMTP Mail-Gateway. (Default: empty)