Fixes configuration on review apps again (#182)

galahq · Dec 12, 2017 · 9ab8eb1 · 9ab8eb1
2 parents 969a8c7 + 1115dc9
commit 9ab8eb1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -78,14 +78,19 @@
   # config.action_mailer.raise_delivery_errors = false
 
   config.action_mailer.default_url_options = { host: 'www.learngala.com' }
-  config.action_mailer.smtp_settings = {
-    address: 'email-smtp.us-west-2.amazonaws.com',
-    port: 587,
-    user_name: ENV['SES_SMTP_USERNAME'],
-    password: ENV['SES_SMTP_PASSWORD'],
-    authentication: :login,
-    enable_starttls_auto: true
-  }
+
+  if ENV['SES_SMTP_USERNAME'] && ENV['SES_SMTP_PASSWORD']
+    config.action_mailer.smtp_settings = {
+      address: 'email-smtp.us-west-2.amazonaws.com',
+      port: 587,
+      user_name: ENV['SES_SMTP_USERNAME'],
+      password: ENV['SES_SMTP_PASSWORD'],
+      authentication: :login,
+      enable_starttls_auto: true
+    }
+  else
+    config.action_mailer.raise_delivery_errors = false
+  end
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).

diff --git a/config/initializers/mock_omniauth.rb b/config/initializers/mock_omniauth.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if Rails.env.development? || ENV['MOCK_OMNIAUTH']
+if Rails.env.development? && !ENV['LOCALHOST_SSL'] || ENV['MOCK_OMNIAUTH']
   OmniAuth.config.test_mode = true
   auth_hash = { provider: 'google_oauth2', uid: '1234567890',
                 info: {