mailer options in config

digitaltom · Jun 8, 2018 · b8403d4 · b8403d4
1 parent 477fa99
commit b8403d4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: OPTS.mail_from
+  default from: OPTS.mail_settings['from']
   layout 'mailer'
 end
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -40,12 +40,14 @@
   # config.action_view.raise_on_missing_translations = true
 
   config.action_mailer.delivery_method = :smtp
+  config.action_mailer.perform_deliveries = true
   config.action_mailer.smtp_settings = {
-    address: '',
-    port: 587,
-    user_name: '',
-    password: '',
-    authentication: 'plain',
-    enable_starttls_auto: true
+    address: OPTS.mail_settings['address'],
+    port: OPTS.mail_settings['port'],
+    user_name: OPTS.mail_settings['user_name'],
+    password: OPTS.mail_settings['password'],
+    authentication: OPTS.mail_settings['authentication'],
+    enable_starttls_auto: OPTS.mail_settings['enable_starttls_auto']
   }
+
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -79,11 +79,11 @@
 
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = {
-    address: '',
-    port: 587,
-    user_name: '',
-    password: '',
-    authentication: 'plain',
-    enable_starttls_auto: true
+    address: OPTS.mail_settings['address'],
+    port: OPTS.mail_settings['port'],
+    user_name: OPTS.mail_settings['user_name'],
+    password: OPTS.mail_settings['password'],
+    authentication: OPTS.mail_settings['authentication'],
+    enable_starttls_auto: OPTS.mail_settings['enable_starttls_auto']
   }
 end
diff --git a/config/options.yml b/config/options.yml
@@ -6,8 +6,14 @@ default:
   background_color: '#f1f1f2'
   combined_image_fontsize: 48
 
-  mail_from: 'noreply@photobooth.org'
-
+  mail_settings:
+    from: ''
+    address: ''
+    port: 587
+    user_name: ''
+    password: ''
+    authentication: 'plain'
+    enable_starttls_auto: true
 
   dropbox:
     # raspi photobooth dropbox app: