diff --git a/config/environments/beta.rb b/config/environments/beta.rb index 11025f141..d89e30cf1 100644 --- a/config/environments/beta.rb +++ b/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 diff --git a/config/environments/production.rb b/config/environments/production.rb index f1d786279..bdb274efb 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -69,12 +69,6 @@ Rails.application.configure do # 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 diff --git a/config/environments/staging.rb b/config/environments/staging.rb index f23bc800b..d89e30cf1 100644 --- a/config/environments/staging.rb +++ b/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