Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/299892
Change subject: rcstream: log X-Forwarded-Proto
......................................................................
rcstream: log X-Forwarded-Proto
Right now the Nginx logs on rcsNNNN hosts are useless for determining which
clients are using HTTPS because TLS termination is done on the Varnishes.
So declare a log format that is identical to 'common' except it includes
X-Forwarded-Proto as an additional field.
Bug: T140128
Change-Id: I39d2d7db5767995ee66dd6481cc57ed891bff274
---
M modules/rcstream/templates/rcstream.nginx.erb
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/92/299892/1
diff --git a/modules/rcstream/templates/rcstream.nginx.erb
b/modules/rcstream/templates/rcstream.nginx.erb
index 6d14a72..e6a72f1 100644
--- a/modules/rcstream/templates/rcstream.nginx.erb
+++ b/modules/rcstream/templates/rcstream.nginx.erb
@@ -16,7 +16,13 @@
listen <%= bind %><%= ' ssl' if @use_ssl %>;
<%- end -%>
server_name <%= @server_name %>;
- access_log /var/log/nginx/rcstream_<%= 'ssl_' if @use_ssl %>access.log;
+
+ log_format combined_with_proto '$remote_addr - $remote_user [$time_local] '
+ '"$request" $status $body_bytes_sent '
+ '"$http_referer" "$http_user_agent" '
+ '"$http_x_forwarded_proto"';
+
+ access_log /var/log/nginx/rcstream_<%= 'ssl_' if @use_ssl %>access.log
combined_with_proto;
error_log /var/log/nginx/rcstream_<%= 'ssl_' if @use_ssl %>error.log;
<%- if @use_ssl -%>
--
To view, visit https://gerrit.wikimedia.org/r/299892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39d2d7db5767995ee66dd6481cc57ed891bff274
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
