From 83bd162c7a5c4582cdf827d055531bf17a8eadb8 Mon Sep 17 00:00:00 2001 From: 0x47 <0x47@users.noreply.github.com> Date: Tue, 27 Apr 2021 17:01:39 +0200 Subject: [PATCH] Fix broken smtp.config.php file (#1482) The current `smtp.config.php` file does not work as advertised in the documentation. Both `MAIL_FROM_ADDRESS` and `MAIL_DOMAIN` should be optional as the Nextcloud instance may use multiple _from addresses_ like no-reply@example.com or passwordreset-no-reply@example.com (or similar). It may also just use the domain name from the instance instead of a configured one. I tested this PR on NC 21 as I don't have access to the previous versions at the moment. I propose to leave NC 19 annd 20 as they are and to continue with this `smtp.config.php` from version 21 forward. Signed-off-by: 0x47 <0x47@users.noreply.github.com> --- 21.0/fpm-alpine/config/smtp.config.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/21.0/fpm-alpine/config/smtp.config.php b/21.0/fpm-alpine/config/smtp.config.php index 59f1eaa1..4bdf2c9a 100644 --- a/21.0/fpm-alpine/config/smtp.config.php +++ b/21.0/fpm-alpine/config/smtp.config.php @@ -1,5 +1,5 @@ 'smtp', 'mail_smtphost' => getenv('SMTP_HOST'), @@ -9,7 +9,11 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN', 'mail_smtpname' => getenv('SMTP_NAME') ?: '', 'mail_smtppassword' => getenv('SMTP_PASSWORD') ?: '', - 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'), - 'mail_domain' => getenv('MAIL_DOMAIN'), ); + if (getenv('MAIL_FROM_ADDRESS')) { + $CONFIG['mail_from_address'] = getenv('MAIL_FROM_ADDRESS'); + } + if (getenv('MAIL_DOMAIN')) { + $CONFIG['mail_domain'] = getenv('MAIL_DOMAIN'); + } }