Merge pull request #6473 from pixelfed/shleeable-patch-2

Update mail.php to allow SMTP to bypass STARTTLS on email server with broken TLS
pull/6490/head
dansup 4 months ago committed by GitHub
commit 723aa68fe5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -74,6 +74,7 @@ MAIL_PASSWORD="null"
MAIL_ENCRYPTION="tls"
MAIL_FROM_ADDRESS="pixelfed@yourdomain.com"
MAIL_FROM_NAME="Pixelfed"
MAIL_AUTO_TLS=true # STARTTLS (false to bypass)
# S3 Configuration (Optional)
PF_ENABLE_CLOUD="false"

@ -67,6 +67,7 @@ MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS="pixelfed@example.com"
MAIL_FROM_NAME="Pixelfed"
MAIL_AUTO_TLS=true # STARTTLS (false to bypass)
## S3 Configuration (Post-Installer)
PF_ENABLE_CLOUD=false

@ -40,6 +40,7 @@ MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_ADDRESS="pixelfed@example.com"
MAIL_FROM_NAME="Pixelfed"
MAIL_AUTO_TLS=true # STARTTLS (false to bypass)
OPEN_REGISTRATION=true
ENFORCE_EMAIL_VERIFICATION=false

@ -45,6 +45,7 @@ return [
'timeout' => null,
'local_domain' => env('MAIL_EHLO_DOMAIN'),
'verify_peer' => env('MAIL_SMTP_VERIFY_PEER', true),
'auto_tls' => env('MAIL_AUTO_TLS', true),
],
'ses' => [

Loading…
Cancel
Save