Browse Source

Make mail configurable between SMTP and Mailgun

Maarten van den Berg 7 years ago
parent
commit
7035281421
3 changed files with 22 additions and 3 deletions
  1. 8 1
      .rbenv-vars-sample
  2. 7 1
      config/environments/development.rb
  3. 7 1
      config/environments/production.rb

+ 8 - 1
.rbenv-vars-sample

@@ -1,7 +1,14 @@
1 1
 # Parameters for sending mail
2
+# smtp or mailgun
3
+MAIL_METHOD=
4
+MAIL_FROM_ADDRESS=
5
+
6
+SMTP_SERVER=
7
+SMTP_USER=
8
+SMTP_PASS=
9
+
2 10
 MAILGUN_DOMAIN=
3 11
 MAILGUN_API_KEY=
4
-MAIL_FROM_ADDRESS=
5 12
 
6 13
 # To be used in link construction
7 14
 AARDBEI_HOSTNAME=

+ 7 - 1
config/environments/development.rb

@@ -52,7 +52,13 @@ Rails.application.configure do
52 52
   # routes, locales, etc. This feature depends on the listen gem.
53 53
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
54 54
 
55
-  config.action_mailer.delivery_method = :mailgun
55
+  config.action_mailer.delivery_method = ENV['MAIL_METHOD']
56
+  config.action_mailer.smtp_settings = {
57
+    address: ENV['SMTP_SERVER'],
58
+    user_name: ENV['SMTP_USER'],
59
+    password: ENV['SMTP_PASS'],
60
+    authentication: :plain
61
+  }
56 62
   config.action_mailer.mailgun_settings = {
57 63
         api_key: ENV['MAILGUN_API_KEY'],
58 64
         domain: ENV['MAILGUN_DOMAIN']

+ 7 - 1
config/environments/production.rb

@@ -84,7 +84,13 @@ Rails.application.configure do
84 84
   # Do not dump schema after migrations.
85 85
   config.active_record.dump_schema_after_migration = false
86 86
 
87
-  config.action_mailer.delivery_method = :mailgun
87
+  config.action_mailer.delivery_method = ENV['MAIL_METHOD']
88
+  config.action_mailer.smtp_settings = {
89
+    address: ENV['SMTP_SERVER'],
90
+    user_name: ENV['SMTP_USER'],
91
+    password: ENV['SMTP_PASS'],
92
+    authentication: :plain
93
+  }
88 94
   config.action_mailer.mailgun_settings = {
89 95
         api_key: ENV['MAILGUN_API_KEY'],
90 96
         domain: ENV['MAILGUN_DOMAIN']