config: fix smtp setup

Fixes #668 Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
SUSE · Jan 21, 2016 · 296dabe · 296dabe
1 parent a0ed6d6
commit 296dabe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -71,11 +71,6 @@
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # By default it picks sendmail as the delivery method. Note that the
-  # `config/initializers/smtp.rb` file will change that in case SMTP was set by
-  # the config file.
-  config.action_mailer.delivery_method = :sendmail
-
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 

diff --git a/config/environments/staging.rb b/config/environments/staging.rb
@@ -71,11 +71,6 @@
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # By default it picks sendmail as the delivery method. Note that the
-  # `config/initializers/smtp.rb` file will change that in case SMTP was set by
-  # the config file.
-  config.action_mailer.delivery_method = :sendmail
-
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 

diff --git a/config/initializers/smtp.rb b/config/initializers/smtp.rb
@@ -1,5 +1,6 @@
 # If SMTP was set, then use it as the delivery method and configure it with the
 # given config.
+
 if defined?(APP_CONFIG) && APP_CONFIG["email"]["smtp"]["enabled"]
   Portus::Application.config.action_mailer.delivery_method = :smtp
 
@@ -13,4 +14,7 @@
     authentication:       :login,
     enable_starttls_auto: true
   }
+else
+  # If SMTP is not enabled, then go for sendmail.
+  Portus::Application.config.action_mailer.delivery_method = :sendmail
 end