vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make HSTS enable optional with force_ssl (#2364)

Browse source
This commit is contained in:
Matt Jankowski 2017-04-23 13:08:32 -04:00 committed by Eugen
parent 1244630ab4
commit 57cd6546c3
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
config/environments/production.rb
View file

@ -35,8 +35,13 @@ Rails.application.configure do
# Allow to specify public IP of reverse proxy if it's needed
config.action_dispatch.trusted_proxies = [IPAddr.new(ENV['TRUSTED_PROXY_IP'])] unless ENV['TRUSTED_PROXY_IP'].blank?
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
config.force_ssl = false
# When LOCAL_HTTPS is set, force traffic over SSL
config.force_ssl = (ENV['LOCAL_HTTPS'] == 'true')
# When ENABLE_HSTS is also set, turn on Strict-Transport-Security
config.ssl_options = {
hsts: (ENV['ENABLE_HSTS'] == 'true')
}
# By default, use the lowest log level to ensure availability of diagnostic information
# when problems arise.
@ -108,8 +113,6 @@ Rails.application.configure do
config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym
config.force_ssl = (ENV['LOCAL_HTTPS'] == 'true')
config.react.variant = :production
config.to_prepare do