Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Trust the upstream proxy to have the correct client IP
......................................................................
Trust the upstream proxy to have the correct client IP
This enables express.js "trust proxy" feature that makes express
consider the left most IP in the X-Forwaded-For header as the client IP.
Change-Id: Ie4f669b735eddfa1ca59eae7096e49567bf41c38
---
M modules/etherpad/templates/settings.json.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/etherpad/templates/settings.json.erb
b/modules/etherpad/templates/settings.json.erb
index 6b983d0..ea38b54 100644
--- a/modules/etherpad/templates/settings.json.erb
+++ b/modules/etherpad/templates/settings.json.erb
@@ -37,7 +37,7 @@
"allowUnknownFileEnds" : false,
"requireAuthentication": false,
"requireAuthorization": false,
- "trustProxy" : false,
+ "trustProxy" : true,
"disableIPlogging" : false,
"socketTransportProtocols" : ["xhr-polling", "jsonp-polling",
"htmlfile"],
"loadTest": false,
--
To view, visit https://gerrit.wikimedia.org/r/255404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4f669b735eddfa1ca59eae7096e49567bf41c38
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits