diff options
author | Spruce (Felix Fichte) <spruce@space-ships.de> | 2013-04-24 12:19:41 +0200 |
---|---|---|
committer | Spruce (Felix Fichte) <spruce@space-ships.de> | 2013-04-24 12:19:41 +0200 |
commit | fb0bc3105687c1a49d2189a22750e95c3df67351 (patch) | |
tree | 5500a6fd3276d2d68fade945045043ee388a637a /settings.json.template | |
parent | 6ea5efbcc3f22906c6ff938a06ea5ca31608ce55 (diff) | |
download | etherpad-lite-fb0bc3105687c1a49d2189a22750e95c3df67351.zip |
updated to use settings
updated handler/SocketIORouter.js to use new setting
updated hooks/express.js to use new setting
updated utils/Settings.js to accept new setting
updated settings.json.template so new setting is present
Diffstat (limited to 'settings.json.template')
-rw-r--r-- | settings.json.template | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/settings.json.template b/settings.json.template index ec0e6f83..011c9e6e 100644 --- a/settings.json.template +++ b/settings.json.template @@ -78,7 +78,10 @@ /* Require authorization by a module, or a user with is_admin set, see below. */ "requireAuthorization": false, - + + /*when you use NginX or another proxy/ load-balancer set this to true*/ + "trustProxy": false, + /* Users for basic authentication. is_admin = true gives access to /admin. If you do not uncomment this, /admin will not be available! */ /* |