diff options
| author | András Maróy <andras@maroy.hu> | 2021-07-30 12:23:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-30 12:23:35 +0000 |
| commit | 5d01cebeab368a6f528570236fee454448a24297 (patch) | |
| tree | f68eb008df68c563f386623e10ecc5be7e81f246 /.config | |
| parent | 188db02474841b96c4f415c2984006a846e92b5e (diff) | |
Implement docker secret handling for SMTP_PASSWORD (#1471)
* Implement docker secret handling for SMTP_PASSWORD
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Use `trim` instead of `rtrim` for `SMTP_PASSWORD_FILE` contents
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Signed-off-by: András Maróy <andras@maroy.hu>
* Runs update.sh
Co-authored-by: GitHub Workflow <workflow@github.com>
Diffstat (limited to '.config')
| -rw-r--r-- | .config/smtp.config.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.config/smtp.config.php b/.config/smtp.config.php index 59f1eaa1..62880e4b 100644 --- a/.config/smtp.config.php +++ b/.config/smtp.config.php @@ -8,8 +8,15 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'), '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('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) { + $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE'))); + } elseif (getenv('SMTP_PASSWORD')) { + $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD'); + } else { + $CONFIG['mail_smtppassword'] = ''; + } } |