about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2017-05-05 04:56:28 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-05-05 04:56:28 +0200
commit4d22d03fabc5f249fd2a93037916b980e4d3f99b (patch)
tree6a4c0fee39f69c16a2c92c3f01c4df81c6126c1b
parent81584779cb1795d2fe7827e054bbe245712528a2 (diff)
Add additional documentation and warnings to the WEB_DOMAIN setting. (#2386)
* Add additional documentation and warnings to the WEB_DOMAIN setting.

This feature is largely undocumented, and quite a number of users have
shot them in the feet already despite the warning. Added a bit of documentation
and expanded the warning until we have a mechanism for dealing with conflicting
user URIs.

* Change WEB_DOMAIN comments to point to the extensive online documentation
-rw-r--r--.env.production.sample3
1 files changed, 2 insertions, 1 deletions
diff --git a/.env.production.sample b/.env.production.sample
index 58b983056..cf08a84b9 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -14,7 +14,8 @@ LOCAL_DOMAIN=example.com
 LOCAL_HTTPS=true
 
 # Use this only if you need to run mastodon on a different domain than the one used for federation.
-# Do not use this unless you know exactly what you are doing.
+# You can read more about this option on https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Serving_a_different_domain.md
+# DO *NOT* USE THIS UNLESS YOU KNOW *EXACTLY* WHAT YOU ARE DOING.
 # WEB_DOMAIN=mastodon.example.com
 
 # Application secrets