luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-21 22:32:58 +00:00
Code Issues Projects Releases Wiki Activity

More SMTP customization (#1372)

Browse source 
* Allow SMTP auth method customization

* Add SMTP openssl_verify_mode option support

Allows one use self-signed certs with their SMTP server.

* Add SMTP enable_starttls_auto option support
This commit is contained in:
Alexander Mankuta 2017-04-10 22:48:30 +03:00 committed by wxcafé
parent f690320fb9
commit 0dbbc16c69
4 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.env.production.sample
View file

@ -35,6 +35,10 @@ SMTP_PORT=587
SMTP_LOGIN= SMTP_LOGIN=
SMTP_PASSWORD= SMTP_PASSWORD=
SMTP_FROM_ADDRESS=notifications@example.com SMTP_FROM_ADDRESS=notifications@example.com
#SMTP_AUTH_METHOD=plain
#SMTP_OPENSSL_VERIFY_MODE=peer
#SMTP_ENABLE_STARTTLS_AUTO=true
# Optional asset host for multi-server setups # Optional asset host for multi-server setups
# CDN_HOST=assets.example.com # CDN_HOST=assets.example.com

12
app.json
View file

@ -79,6 +79,18 @@
"SMTP_FROM_ADDRESS": { "SMTP_FROM_ADDRESS": {
"description": "Address to send emails from", "description": "Address to send emails from",
"required": false "required": false
},
"SMTP_AUTH_METHOD": {
"description": "Authentication method to use with SMTP server. Default is 'plain'.",
"required": false
},
"SMTP_OPENSSL_VERIFY_MODE": {
"description": "SMTP server certificate verification mode. Defaults is 'peer'.",
"required": false
},
"SMTP_ENABLE_STARTTLS_AUTO": {
"description": "Enable STARTTLS if SMTP server supports it? Default is true.",
"required": false
} }
}, },
"buildpacks": [ "buildpacks": [

4
config/environments/production.rb
View file

@ -99,7 +99,9 @@ Rails.application.configure do
:user_name => ENV['SMTP_LOGIN'], :user_name => ENV['SMTP_LOGIN'],
:password => ENV['SMTP_PASSWORD'], :password => ENV['SMTP_PASSWORD'],
:domain => ENV['SMTP_DOMAIN'] || config.x.local_domain, :domain => ENV['SMTP_DOMAIN'] || config.x.local_domain,
:authentication => :plain, :authentication => ENV['SMTP_AUTH_METHOD'] || :plain,
:openssl_verify_mode => ENV['SMTP_OPENSSL_VERIFY_MODE'] || 'peer',
:enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true,
} }
config.action_mailer.delivery_method = :smtp config.action_mailer.delivery_method = :smtp

12
scalingo.json
View file

@ -71,6 +71,18 @@
"description": "Address to send emails from", "description": "Address to send emails from",
"required": false "required": false
}, },
"SMTP_AUTH_METHOD": {
"description": "Authentication method to use with SMTP server. Default is 'plain'.",
"required": false
},
"SMTP_OPENSSL_VERIFY_MODE": {
"description": "SMTP server certificate verification mode. Defaults is 'peer'.",
"required": false
},
"SMTP_ENABLE_STARTTLS_AUTO": {
"description": "Enable STARTTLS if SMTP server supports it? Default is true.",
"required": false
},
"BUILDPACK_URL": { "BUILDPACK_URL": {
"description": "Internal scalingo configuration", "description": "Internal scalingo configuration",
"required": true, "required": true,