diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 18:21:59 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 18:21:59 +0200 |
commit | 50b430d9a2857edf8ab44e9b94c7bcb14ecd2117 (patch) | |
tree | 4932ca1d8e52f6ce9b8b9fbb304b6bfce4027e54 /config/initializers/1_hosts.rb | |
parent | a346912030012dc1451249373ff7ef1a61016517 (diff) | |
parent | d8e0c8a89e1f1dd1c4ce1513deaeb3c85c6e4a42 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
- `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.
Diffstat (limited to 'config/initializers/1_hosts.rb')
-rw-r--r-- | config/initializers/1_hosts.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/config/initializers/1_hosts.rb b/config/initializers/1_hosts.rb index 757f1f735..eaf6e0181 100644 --- a/config/initializers/1_hosts.rb +++ b/config/initializers/1_hosts.rb @@ -4,7 +4,7 @@ port = ENV.fetch('PORT') { 3000 } host = ENV.fetch('LOCAL_DOMAIN') { "localhost:#{port}" } web_host = ENV.fetch('WEB_DOMAIN') { host } -alternate_domains = ENV.fetch('ALTERNATE_DOMAINS') { '' } +alternate_domains = ENV.fetch('ALTERNATE_DOMAINS') { '' }.split(/\s*,\s*/) Rails.application.configure do https = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true' @@ -15,7 +15,7 @@ Rails.application.configure do config.x.use_s3 = ENV['S3_ENABLED'] == 'true' config.x.use_swift = ENV['SWIFT_ENABLED'] == 'true' - config.x.alternate_domains = alternate_domains.split(/\s*,\s*/) + config.x.alternate_domains = alternate_domains config.action_mailer.default_url_options = { host: web_host, protocol: https ? 'https://' : 'http://', trailing_slash: false } @@ -26,4 +26,10 @@ Rails.application.configure do "ws://#{ENV['REMOTE_DEV'] == 'true' ? host.split(':').first : 'localhost'}:4000" end end + + unless Rails.env.test? + config.hosts << host if host.present? + config.hosts << web_host if web_host.present? + config.hosts.concat(alternate_domains) if alternate_domains.present? + end end |