mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-21 22:32:58 +00:00
Adding e-mail configuration
This commit is contained in:
parent
8767a98fbb
commit
2c374cd97c
|
@ -1,5 +1,17 @@
|
||||||
|
# Service dependencies
|
||||||
REDIS_HOST=redis
|
REDIS_HOST=redis
|
||||||
|
|
||||||
|
# Federation
|
||||||
LOCAL_DOMAIN=example.com
|
LOCAL_DOMAIN=example.com
|
||||||
LOCAL_HTTPS=true
|
LOCAL_HTTPS=true
|
||||||
|
|
||||||
|
# Application secrets
|
||||||
PAPERCLIP_SECRET=
|
PAPERCLIP_SECRET=
|
||||||
SECRET_KEY_BASE=
|
SECRET_KEY_BASE=
|
||||||
|
|
||||||
|
# E-mail configuration
|
||||||
|
SMTP_SERVER=smtp.mailgun.org
|
||||||
|
SMTP_PORT=587
|
||||||
|
SMTP_LOGIN=
|
||||||
|
SMTP_PASSWORD=
|
||||||
|
SMTP_FROM_ADDRESS=notifications@example.com
|
||||||
|
|
|
@ -76,4 +76,16 @@ Rails.application.configure do
|
||||||
|
|
||||||
# Do not dump schema after migrations.
|
# Do not dump schema after migrations.
|
||||||
config.active_record.dump_schema_after_migration = false
|
config.active_record.dump_schema_after_migration = false
|
||||||
|
|
||||||
|
# E-mails
|
||||||
|
config.action_mailer.smtp_settings = {
|
||||||
|
:port => ENV['SMTP_PORT'],
|
||||||
|
:address => ENV['SMTP_SERVER'],
|
||||||
|
:user_name => ENV['SMTP_LOGIN'],
|
||||||
|
:password => ENV['SMTP_PASSWORD'],
|
||||||
|
:domain => config.x.local_domain,
|
||||||
|
:authentication => :plain,
|
||||||
|
}
|
||||||
|
|
||||||
|
config.action_mailer.delivery_method = :smtp
|
||||||
end
|
end
|
||||||
|
|
|
@ -12,7 +12,7 @@ Devise.setup do |config|
|
||||||
# Configure the e-mail address which will be shown in Devise::Mailer,
|
# Configure the e-mail address which will be shown in Devise::Mailer,
|
||||||
# note that it will be overwritten if you use your own mailer class
|
# note that it will be overwritten if you use your own mailer class
|
||||||
# with default "from" parameter.
|
# with default "from" parameter.
|
||||||
config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
|
config.mailer_sender = ENV['SMTP_FROM_ADDRESS'] || 'notifications@localhost'
|
||||||
|
|
||||||
# Configure the class responsible to send e-mails.
|
# Configure the class responsible to send e-mails.
|
||||||
# config.mailer = 'Devise::Mailer'
|
# config.mailer = 'Devise::Mailer'
|
||||||
|
|
Loading…
Reference in a new issue