scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-01 12:38:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #999 from okriuchykhin/smtp_auth_method

Browse source 
Allow setting of SMTP auth method through ENV variable
This commit is contained in:
okriuchykhin 2018-02-15 13:40:20 +01:00 committed by GitHub
commit 0503aa054d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/environments/development.rb
View file

@ -48,7 +48,7 @@ Rails.application.configure do
address: Rails.application.secrets.mailer_address, address: Rails.application.secrets.mailer_address,
port: Rails.application.secrets.mailer_port, port: Rails.application.secrets.mailer_port,
domain: Rails.application.secrets.mailer_domain, domain: Rails.application.secrets.mailer_domain,
authentication: 'plain', authentication: Rails.application.secrets.mailer_authentication,
enable_starttls_auto: true, enable_starttls_auto: true,
user_name: Rails.application.secrets.mailer_user_name, user_name: Rails.application.secrets.mailer_user_name,
password: Rails.application.secrets.mailer_password password: Rails.application.secrets.mailer_password

2
config/environments/production.rb
View file

@ -33,7 +33,7 @@ Rails.application.configure do
address: Rails.application.secrets.mailer_address, address: Rails.application.secrets.mailer_address,
port: Rails.application.secrets.mailer_port, port: Rails.application.secrets.mailer_port,
domain: Rails.application.secrets.mailer_domain, domain: Rails.application.secrets.mailer_domain,
authentication: "plain", authentication: Rails.application.secrets.mailer_authentication,
enable_starttls_auto: true, enable_starttls_auto: true,
user_name: Rails.application.secrets.mailer_user_name, user_name: Rails.application.secrets.mailer_user_name,
password: Rails.application.secrets.mailer_password password: Rails.application.secrets.mailer_password

2
config/environments/test.rb
View file

@ -62,7 +62,7 @@ Rails.application.configure do
address: Rails.application.secrets.mailer_address, address: Rails.application.secrets.mailer_address,
port: Rails.application.secrets.mailer_port, port: Rails.application.secrets.mailer_port,
domain: Rails.application.secrets.mailer_domain, domain: Rails.application.secrets.mailer_domain,
authentication: "plain", authentication: Rails.application.secrets.mailer_authentication,
enable_starttls_auto: true, enable_starttls_auto: true,
user_name: Rails.application.secrets.mailer_user_name, user_name: Rails.application.secrets.mailer_user_name,
password: Rails.application.secrets.mailer_password password: Rails.application.secrets.mailer_password

1
config/secrets.yml
View file

@ -37,6 +37,7 @@ common: &common
mailer_reply_to: <%= ENV["MAIL_REPLYTO"] %> mailer_reply_to: <%= ENV["MAIL_REPLYTO"] %>
mailer_address: <%= ENV["SMTP_ADDRESS"] %> mailer_address: <%= ENV["SMTP_ADDRESS"] %>
mailer_port: <%= ENV["SMTP_PORT"] || "587" %> mailer_port: <%= ENV["SMTP_PORT"] || "587" %>
mailer_authentication: <%= ENV["SMTP_AUTH_METHOD"] || "plain" %>
mailer_domain: <%= ENV["SMTP_DOMAIN"] %> mailer_domain: <%= ENV["SMTP_DOMAIN"] %>
mailer_user_name: <%= ENV["SMTP_USERNAME"] %> mailer_user_name: <%= ENV["SMTP_USERNAME"] %>
mailer_password: <%= ENV["SMTP_PASSWORD"] %> mailer_password: <%= ENV["SMTP_PASSWORD"] %>