diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-25 18:28:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 18:28:27 +0200 |
| commit | a481af15a9b2a7829c2a849906aa4b475ccdbd98 (patch) | |
| tree | 2316623ed73758bd1d61477d94aee3492744933c /config/environments | |
| parent | bb12af7250c9368905bae7d91c6ff0b06f3aa400 (diff) | |
| parent | 002d2729fb342ec899d4322bbd64331da7d22a03 (diff) | |
Merge pull request #1750 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/environments')
| -rw-r--r-- | config/environments/production.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 8d82a46f6..69f80667e 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -42,7 +42,7 @@ Rails.application.configure do config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX # Allow to specify public IP of reverse proxy if it's needed - config.action_dispatch.trusted_proxies = ENV['TRUSTED_PROXY_IP'].split.map { |item| IPAddr.new(item) } if ENV['TRUSTED_PROXY_IP'].present? + config.action_dispatch.trusted_proxies = ENV['TRUSTED_PROXY_IP'].split(/(?:\s*,\s*|\s+)/).map { |item| IPAddr.new(item) } if ENV['TRUSTED_PROXY_IP'].present? config.force_ssl = true config.ssl_options = { |