Ori.livneh has submitted this change and it was merged.
Change subject: Fix-up for I39d2d7db576: move log_format directive to top level
......................................................................
Fix-up for I39d2d7db576: move log_format directive to top level
Change-Id: I05c4f1f42cc7c118d5a9c8a1f4066cff78c74c71
---
M modules/rcstream/templates/rcstream.nginx.erb
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/rcstream/templates/rcstream.nginx.erb
b/modules/rcstream/templates/rcstream.nginx.erb
index e6a72f1..74de9d2 100644
--- a/modules/rcstream/templates/rcstream.nginx.erb
+++ b/modules/rcstream/templates/rcstream.nginx.erb
@@ -9,6 +9,11 @@
server <%= if backend.to_s.include?(':') then backend else
"127.0.0.1:#{backend}" end %>;
<%- end -%>
}
+
+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"';
<%- end -%>
server {
@@ -17,10 +22,6 @@
<%- end -%>
server_name <%= @server_name %>;
- 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;
--
To view, visit https://gerrit.wikimedia.org/r/299898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05c4f1f42cc7c118d5a9c8a1f4066cff78c74c71
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
