diff options
| author | GitHub Workflow <workflow@github.com> | 2022-09-02 16:00:36 +0300 |
|---|---|---|
| committer | GitHub Workflow <workflow@github.com> | 2022-09-02 16:00:36 +0300 |
| commit | 338b483247502df9be2b5e23b8a1bbaf8c678adc (patch) | |
| tree | 4ae97f8078d3cbe0d7262102f2cacc89418a641a | |
| parent | d447c5793a41537f737f822f0d5bcd294ff28eb9 (diff) | |
Runs update.sh
| -rw-r--r-- | 23/apache/config/smtp.config.php | 2 | ||||
| -rw-r--r-- | 23/fpm-alpine/config/smtp.config.php | 2 | ||||
| -rw-r--r-- | 23/fpm/config/smtp.config.php | 2 | ||||
| -rw-r--r-- | 24/apache/config/smtp.config.php | 2 | ||||
| -rw-r--r-- | 24/fpm-alpine/config/smtp.config.php | 2 | ||||
| -rw-r--r-- | 24/fpm/config/smtp.config.php | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/23/apache/config/smtp.config.php b/23/apache/config/smtp.config.php index 62880e4..5006fe4 100644 --- a/23/apache/config/smtp.config.php +++ b/23/apache/config/smtp.config.php @@ -5,7 +5,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) 'mail_smtphost' => getenv('SMTP_HOST'), 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25), 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '', - 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'), + 'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE')))), 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN', 'mail_smtpname' => getenv('SMTP_NAME') ?: '', 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'), diff --git a/23/fpm-alpine/config/smtp.config.php b/23/fpm-alpine/config/smtp.config.php index 62880e4..5006fe4 100644 --- a/23/fpm-alpine/config/smtp.config.php +++ b/23/fpm-alpine/config/smtp.config.php @@ -5,7 +5,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) 'mail_smtphost' => getenv('SMTP_HOST'), 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25), 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '', - 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'), + 'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE')))), 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN', 'mail_smtpname' => getenv('SMTP_NAME') ?: '', 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'), diff --git a/23/fpm/config/smtp.config.php b/23/fpm/config/smtp.config.php index 62880e4..5006fe4 100644 --- a/23/fpm/config/smtp.config.php +++ b/23/fpm/config/smtp.config.php @@ -5,7 +5,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) 'mail_smtphost' => getenv('SMTP_HOST'), 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25), 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '', - 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'), + 'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE')))), 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN', 'mail_smtpname' => getenv('SMTP_NAME') ?: '', 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'), diff --git a/24/apache/config/smtp.config.php b/24/apache/config/smtp.config.php index 62880e4..5006fe4 100644 --- a/24/apache/config/smtp.config.php +++ b/24/apache/config/smtp.config.php @@ -5,7 +5,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) 'mail_smtphost' => getenv('SMTP_HOST'), 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25), 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '', - 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'), + 'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE')))), 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN', 'mail_smtpname' => getenv('SMTP_NAME') ?: '', 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'), diff --git a/24/fpm-alpine/config/smtp.config.php b/24/fpm-alpine/config/smtp.config.php index 62880e4..5006fe4 100644 --- a/24/fpm-alpine/config/smtp.config.php +++ b/24/fpm-alpine/config/smtp.config.php @@ -5,7 +5,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) 'mail_smtphost' => getenv('SMTP_HOST'), 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25), 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '', - 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'), + 'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE')))), 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN', 'mail_smtpname' => getenv('SMTP_NAME') ?: '', 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'), diff --git a/24/fpm/config/smtp.config.php b/24/fpm/config/smtp.config.php index 62880e4..5006fe4 100644 --- a/24/fpm/config/smtp.config.php +++ b/24/fpm/config/smtp.config.php @@ -5,7 +5,7 @@ if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) 'mail_smtphost' => getenv('SMTP_HOST'), 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25), 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '', - 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'), + 'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE')))), 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN', 'mail_smtpname' => getenv('SMTP_NAME') ?: '', 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'), |