Adding e-mail configuration

diff --git a/.env.production.sample b/.env.production.sample
index 704eb6be39bd5523b51c19f7d7bce35a15e77f01..3460328819fded58b3d073ce957078374cdfd456 100644 (file)
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -1,5 +1,17 @@
+# Service dependencies
 REDIS_HOST=redis
+
+# Federation
 LOCAL_DOMAIN=example.com
 LOCAL_HTTPS=true
+
+# Application secrets
 PAPERCLIP_SECRET=
 SECRET_KEY_BASE=
+
+# E-mail configuration
+SMTP_SERVER=smtp.mailgun.org
+SMTP_PORT=587
+SMTP_LOGIN=
+SMTP_PASSWORD=
+SMTP_FROM_ADDRESS=notifications@example.com

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5c1b32e4863ffe9aed61e6b63f70ef0b7b70dd93..b0236d09e375335fd882baf58ceac792b44e2f4c 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -76,4 +76,16 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   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

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 89747999aa216edb981215b973dc3f3b8581b858..4ddef45ef12fa65e7aef15dd1fdc8a6e6c753b50 100644 (file)
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -12,7 +12,7 @@ Devise.setup do |config|
   # 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
   # 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.
   # config.mailer = 'Devise::Mailer'