Alexandros Kosiaris has submitted this change and it was merged.
Change subject: etherpad: Log the incoming request's IP address
......................................................................
etherpad: Log the incoming request's IP address
Since now etherpad is behind a Varnish proxy, we need to use the
X-Real-IP header set by Varnish to log the actual IP address connecting
to our apache installation
Change-Id: I8b2b5a7fd9bcda7e661d03a80af23c926e423285
---
M templates/apache/sites/etherpad.wikimedia.org.erb
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/apache/sites/etherpad.wikimedia.org.erb
b/templates/apache/sites/etherpad.wikimedia.org.erb
index 46abf8f..d298d0b 100644
--- a/templates/apache/sites/etherpad.wikimedia.org.erb
+++ b/templates/apache/sites/etherpad.wikimedia.org.erb
@@ -55,6 +55,8 @@
</Proxy>
ErrorLog ${APACHE_LOG_DIR}/<%= @etherpad_host %>-error.log
LogLevel warn
- CustomLog ${APACHE_LOG_DIR}/<%= @etherpad_host %>-access.log combined
+ # Rely on X-Real-IP to log the actual IP of the request
+ LogFormat "%{X-Real-IP}i %l %u %t \"%r\" %>s %O \"%{Referer}i\"
\"%{User-Agent}i\"" proxied
+ CustomLog ${APACHE_LOG_DIR}/<%= @etherpad_host %>-access.log proxied
</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/220087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b2b5a7fd9bcda7e661d03a80af23c926e423285
Gerrit-PatchSet: 8
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
