diff options
| author | nightpool <eg1290@gmail.com> | 2017-12-21 19:17:59 -0600 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-12-22 02:17:59 +0100 |
| commit | 9592b5e31e19ce470252ade7b8df73625e2592e6 (patch) | |
| tree | cb336e94f5328daab42b5952d20e6178d7af14e4 | |
| parent | cea98e0c12759528d4a17f59c0e7616b7d426c8c (diff) | |
enforce LOCAL_HTTPS=true in production (#6061)
* enforce https in production * note changes in production env sample * typo fix
| -rw-r--r-- | .env.production.sample | 5 | ||||
| -rw-r--r-- | config/initializers/ostatus.rb | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.env.production.sample b/.env.production.sample index 91fcce6ac..3f0edd72f 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -11,10 +11,11 @@ DB_PASS= DB_PORT=5432 # Federation -# Note: Changing LOCAL_DOMAIN or LOCAL_HTTPS at a later time will cause unwanted side effects. +# Note: Changing LOCAL_DOMAIN at a later time will cause unwanted side effects, including breaking all existing federation. # LOCAL_DOMAIN should *NOT* contain the protocol part of the domain e.g https://example.com. LOCAL_DOMAIN=example.com -LOCAL_HTTPS=true + +# Changing LOCAL_HTTPS in production is no longer supported. (Mastodon will always serve https:// links) # Use this only if you need to run mastodon on a different domain than the one used for federation. # You can read more about this option on https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Serving_a_different_domain.md diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index bb8591f74..5773b7290 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -3,11 +3,12 @@ port = ENV.fetch('PORT') { 3000 } host = ENV.fetch('LOCAL_DOMAIN') { "localhost:#{port}" } web_host = ENV.fetch('WEB_DOMAIN') { host } -https = ENV['LOCAL_HTTPS'] == 'true' alternate_domains = ENV.fetch('ALTERNATE_DOMAINS') { '' } Rails.application.configure do + https = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true' + config.x.local_domain = host config.x.web_domain = web_host config.x.use_https = https |