mirror of
https://github.com/friendica/docker
synced 2025-03-30 07:55:17 +02:00
Merge pull request #245 from nupplaphil/bug/starttls_msmtp
Fix tls_starttls behavior for msmtp setups
This commit is contained in:
commit
4196041aee
11 changed files with 36 additions and 11 deletions
|
@ -7,6 +7,8 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
|
|
||||||
smtp_from="${SMTP_FROM:=no-reply}"
|
smtp_from="${SMTP_FROM:=no-reply}"
|
||||||
smtp_auth="${SMTP_AUTH:=on}"
|
smtp_auth="${SMTP_AUTH:=on}"
|
||||||
|
# https://github.com/friendica/docker/issues/233
|
||||||
|
smtp_starttls="${SMTP_STARTTLS:=on}"
|
||||||
|
|
||||||
# Setup MSMTP
|
# Setup MSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
|
@ -26,7 +28,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
||||||
echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
|
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_TLS+x}" ]; then echo "tls on"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
|
echo "tls_starttls $smtp_starttls";
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; 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_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
||||||
|
|
|
@ -7,6 +7,8 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
|
|
||||||
smtp_from="${SMTP_FROM:=no-reply}"
|
smtp_from="${SMTP_FROM:=no-reply}"
|
||||||
smtp_auth="${SMTP_AUTH:=on}"
|
smtp_auth="${SMTP_AUTH:=on}"
|
||||||
|
# https://github.com/friendica/docker/issues/233
|
||||||
|
smtp_starttls="${SMTP_STARTTLS:=on}"
|
||||||
|
|
||||||
# Setup MSMTP
|
# Setup MSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
|
@ -26,7 +28,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
||||||
echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
|
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_TLS+x}" ]; then echo "tls on"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
|
echo "tls_starttls $smtp_starttls";
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; 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_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
||||||
|
|
|
@ -7,6 +7,8 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
|
|
||||||
smtp_from="${SMTP_FROM:=no-reply}"
|
smtp_from="${SMTP_FROM:=no-reply}"
|
||||||
smtp_auth="${SMTP_AUTH:=on}"
|
smtp_auth="${SMTP_AUTH:=on}"
|
||||||
|
# https://github.com/friendica/docker/issues/233
|
||||||
|
smtp_starttls="${SMTP_STARTTLS:=on}"
|
||||||
|
|
||||||
# Setup MSMTP
|
# Setup MSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
|
@ -26,7 +28,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
||||||
echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
|
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_TLS+x}" ]; then echo "tls on"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
|
echo "tls_starttls $smtp_starttls";
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; 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_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
||||||
|
|
|
@ -7,6 +7,8 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
|
|
||||||
smtp_from="${SMTP_FROM:=no-reply}"
|
smtp_from="${SMTP_FROM:=no-reply}"
|
||||||
smtp_auth="${SMTP_AUTH:=on}"
|
smtp_auth="${SMTP_AUTH:=on}"
|
||||||
|
# https://github.com/friendica/docker/issues/233
|
||||||
|
smtp_starttls="${SMTP_STARTTLS:=on}"
|
||||||
|
|
||||||
# Setup MSMTP
|
# Setup MSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
|
@ -26,7 +28,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
||||||
echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
|
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_TLS+x}" ]; then echo "tls on"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
|
echo "tls_starttls $smtp_starttls";
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; 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_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
||||||
|
|
|
@ -7,6 +7,8 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
|
|
||||||
smtp_from="${SMTP_FROM:=no-reply}"
|
smtp_from="${SMTP_FROM:=no-reply}"
|
||||||
smtp_auth="${SMTP_AUTH:=on}"
|
smtp_auth="${SMTP_AUTH:=on}"
|
||||||
|
# https://github.com/friendica/docker/issues/233
|
||||||
|
smtp_starttls="${SMTP_STARTTLS:=on}"
|
||||||
|
|
||||||
# Setup MSMTP
|
# Setup MSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
|
@ -26,7 +28,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
||||||
echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
|
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_TLS+x}" ]; then echo "tls on"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
|
echo "tls_starttls $smtp_starttls";
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; 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_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
||||||
|
|
|
@ -7,6 +7,8 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
|
|
||||||
smtp_from="${SMTP_FROM:=no-reply}"
|
smtp_from="${SMTP_FROM:=no-reply}"
|
||||||
smtp_auth="${SMTP_AUTH:=on}"
|
smtp_auth="${SMTP_AUTH:=on}"
|
||||||
|
# https://github.com/friendica/docker/issues/233
|
||||||
|
smtp_starttls="${SMTP_STARTTLS:=on}"
|
||||||
|
|
||||||
# Setup MSMTP
|
# Setup MSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
|
@ -26,7 +28,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
||||||
echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
|
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_TLS+x}" ]; then echo "tls on"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
|
echo "tls_starttls $smtp_starttls";
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; 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_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
||||||
|
|
|
@ -7,6 +7,8 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
|
|
||||||
smtp_from="${SMTP_FROM:=no-reply}"
|
smtp_from="${SMTP_FROM:=no-reply}"
|
||||||
smtp_auth="${SMTP_AUTH:=on}"
|
smtp_auth="${SMTP_AUTH:=on}"
|
||||||
|
# https://github.com/friendica/docker/issues/233
|
||||||
|
smtp_starttls="${SMTP_STARTTLS:=on}"
|
||||||
|
|
||||||
# Setup MSMTP
|
# Setup MSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
|
@ -26,7 +28,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
||||||
echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
|
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_TLS+x}" ]; then echo "tls on"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
|
echo "tls_starttls $smtp_starttls";
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; 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_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
||||||
|
|
|
@ -7,6 +7,8 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
|
|
||||||
smtp_from="${SMTP_FROM:=no-reply}"
|
smtp_from="${SMTP_FROM:=no-reply}"
|
||||||
smtp_auth="${SMTP_AUTH:=on}"
|
smtp_auth="${SMTP_AUTH:=on}"
|
||||||
|
# https://github.com/friendica/docker/issues/233
|
||||||
|
smtp_starttls="${SMTP_STARTTLS:=on}"
|
||||||
|
|
||||||
# Setup MSMTP
|
# Setup MSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
|
@ -26,7 +28,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
||||||
echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
|
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_TLS+x}" ]; then echo "tls on"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
|
echo "tls_starttls $smtp_starttls";
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; 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_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
||||||
|
|
|
@ -7,6 +7,8 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
|
|
||||||
smtp_from="${SMTP_FROM:=no-reply}"
|
smtp_from="${SMTP_FROM:=no-reply}"
|
||||||
smtp_auth="${SMTP_AUTH:=on}"
|
smtp_auth="${SMTP_AUTH:=on}"
|
||||||
|
# https://github.com/friendica/docker/issues/233
|
||||||
|
smtp_starttls="${SMTP_STARTTLS:=on}"
|
||||||
|
|
||||||
# Setup MSMTP
|
# Setup MSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
|
@ -26,7 +28,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
||||||
echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
|
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_TLS+x}" ]; then echo "tls on"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
|
echo "tls_starttls $smtp_starttls";
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; 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_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
||||||
|
|
|
@ -123,11 +123,16 @@ The following environment variables are possible for the SMTP examples.
|
||||||
- `SMTP_DOMAIN` The sender domain. (**required** - e.g. `friendica.local`)
|
- `SMTP_DOMAIN` The sender domain. (**required** - e.g. `friendica.local`)
|
||||||
- `SMTP_FROM` Sender user-part of the address. (Default: `no-reply` - e.g. no-reply@friendica.local)
|
- `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_TLS` Use TLS for connecting the SMTP Mail-Gateway. (Default: empty)
|
||||||
- `SMTP_STARTTLS` Use STARTTLS for connecting the SMTP Mail-Gateway. (Default: empty)
|
- `SMTP_STARTTLS` Use STARTTLS for connecting the SMTP Mail-Gateway. (Default: `On`)
|
||||||
- `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_USER` Username for the SMTP Mail-Gateway. (Default: empty)
|
||||||
- `SMTP_AUTH_PASS` Password for the SMTP Mail-Gateway. (Default: empty)
|
- `SMTP_AUTH_PASS` Password for the SMTP Mail-Gateway. (Default: empty)
|
||||||
|
|
||||||
|
**Addition to STARTTLS**
|
||||||
|
|
||||||
|
the `tls_starttls` setting is either `On` or `Off`, but never unset.
|
||||||
|
That's because in case it's unset, `starttls` would be activated by default (which would need additional configuration like a separate port).
|
||||||
|
|
||||||
## Database settings
|
## Database settings
|
||||||
|
|
||||||
You have to add the Friendica container to the same network as the running database container, e. g. `--network some-network`, and then use `mysql` as the database host on setup.
|
You have to add the Friendica container to the same network as the running database container, e. g. `--network some-network`, and then use `mysql` as the database host on setup.
|
||||||
|
|
|
@ -7,6 +7,8 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
|
|
||||||
smtp_from="${SMTP_FROM:=no-reply}"
|
smtp_from="${SMTP_FROM:=no-reply}"
|
||||||
smtp_auth="${SMTP_AUTH:=on}"
|
smtp_auth="${SMTP_AUTH:=on}"
|
||||||
|
# https://github.com/friendica/docker/issues/233
|
||||||
|
smtp_starttls="${SMTP_STARTTLS:=on}"
|
||||||
|
|
||||||
# Setup MSMTP
|
# Setup MSMTP
|
||||||
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
|
||||||
|
@ -26,7 +28,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
|
||||||
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
echo "from \"$smtp_from@$SMTP_DOMAIN\""
|
||||||
echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
|
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_TLS+x}" ]; then echo "tls on"; fi
|
||||||
if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
|
echo "tls_starttls $smtp_starttls";
|
||||||
if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; 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_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
|
||||||
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue