diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-22 04:17:14 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-22 04:17:14 +0000 |
| commit | 6d00ca1c718e32ff3e4106cd06042f047c24e908 (patch) | |
| tree | 8cb59949c9de424ac0b9496a3bf0ec1db480450e /.env.production.sample | |
| parent | 4a7782d5c98f830f5ef65a52f176d94bef53b7fc (diff) | |
| parent | 9592b5e31e19ce470252ade7b8df73625e2592e6 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to '.env.production.sample')
| -rw-r--r-- | .env.production.sample | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.env.production.sample b/.env.production.sample index 27de27de4..cf1654e99 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 |