Merge pull request #1758 from basecamp/clean-env

Move env-specific bits to the engine

Author: jorgemanrubia

Gemfile.saas.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/basecamp/fizzy-saas
-  revision: f80da3c2faf34b94d65a41a501f19e8dba379012
+  revision: 27d4d34091de8db53bb01ac604c56e1a83b3adc3
   specs:
     fizzy-saas (0.1.0)
       prometheus-client-mmap

config/environments/beta.rb

@@ -1,8 +1 @@
 require_relative "production"
-
-Rails.application.configure do
-  config.action_mailer.smtp_settings[:domain] = "fizzy-beta.37signals.com"
-  config.action_mailer.smtp_settings[:address] = "smtp-outbound-staging"
-  config.action_mailer.default_url_options     = { host: "fizzy-beta.37signals.com", protocol: "https" }
-  config.action_controller.default_url_options = { host: "fizzy-beta.37signals.com", protocol: "https" }
-end

config/environments/development.rb

@@ -88,9 +88,4 @@
   # Set host to be used by links generated in mailer and notification view templates.
   config.action_controller.default_url_options = { host: config.hosts.first, port: 3006 }
   config.action_mailer.default_url_options     = { host: config.hosts.first, port: 3006 }
-
-  if Rails.root.join("tmp/solid-queue.txt").exist?
-    config.active_job.queue_adapter = :solid_queue
-    config.solid_queue.connects_to = { database: { writing: :queue, reading: :queue } }
-  end
 end

config/environments/production.rb

@@ -69,12 +69,6 @@
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Set host to be used by links generated in mailer and notification view templates.
-  config.action_controller.default_url_options = { host: "app.fizzy.do", protocol: "https" }
-  config.action_mailer.default_url_options     = { host: "app.fizzy.do", protocol: "https" }
-
-  config.action_mailer.smtp_settings = { domain: "app.fizzy.do", address: "smtp-outbound", port: 25, enable_starttls_auto: false }
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true

config/environments/staging.rb

@@ -1,8 +1 @@
 require_relative "production"
-
-Rails.application.configure do
-  config.action_mailer.smtp_settings[:domain] = "fizzy.37signals-staging.com"
-  config.action_mailer.smtp_settings[:address] = "smtp-outbound-staging"
-  config.action_mailer.default_url_options     = { host: "fizzy.37signals-staging.com", protocol: "https" }
-  config.action_controller.default_url_options = { host: "fizzy.37signals-staging.com", protocol: "https" }
-end