Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: modules/nginx/templates/nginx.conf.erb

Issue 29328450: Issue 3102 - Introduce log_format "data" for storing POST messages (Closed)
Left Patch Set: Created Sept. 21, 2015, 11:52 a.m.
Right Patch Set: Issue 3102 - Fixed missing whitespace issue Created Sept. 22, 2015, 6:57 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 user <%= scope.lookupvar('nginx::params::user') %> <%= scope.lookupvar('nginx::p arams::group') %>; 1 user <%= scope.lookupvar('nginx::params::user') %> <%= scope.lookupvar('nginx::p arams::group') %>;
2 worker_processes <%= worker_processes %>; 2 worker_processes <%= worker_processes %>;
3 3
4 error_log /var/log/nginx/error.log notice; 4 error_log /var/log/nginx/error.log notice;
5 pid /var/run/nginx.pid; 5 pid /var/run/nginx.pid;
6 6
7 events { 7 events {
8 worker_connections <%= worker_connections %>; 8 worker_connections <%= worker_connections %>;
9 <% if scope.lookupvar('nginx::params::multi_accept') == 'on' %>multi_accept on ;<% end %> 9 <% if scope.lookupvar('nginx::params::multi_accept') == 'on' %>multi_accept on ;<% end %>
10 } 10 }
11 worker_rlimit_nofile <%= scope.lookupvar('nginx::params::worker_rlimit_nofile') %>; 11 worker_rlimit_nofile <%= scope.lookupvar('nginx::params::worker_rlimit_nofile') %>;
12 12
13 http { 13 http {
14 include /etc/nginx/mime.types; 14 include /etc/nginx/mime.types;
15 default_type application/octet-stream; 15 default_type application/octet-stream;
16 16
17 log_format main '$remote_addr - $remote_user [$time_local] "$request" ' 17 log_format main '$remote_addr - $remote_user [$time_local] "$request" '
18 '$status $bytes_sent "$http_referer" ' 18 '$status $bytes_sent "$http_referer" '
19 '"$http_user_agent" "$http_x_forwarded_for" $scheme ' 19 '"$http_user_agent" "$http_x_forwarded_for" $scheme '
20 '"$http_accept_language" "$http_host" "$http_x_client_id"'; 20 '"$http_accept_language" "$http_host" "$http_x_client_id"';
21
22 log_format data '$remote_addr - $remote_user [$time_local] "$request" '
23 '$status $bytes_sent "$http_referer" '
24 '"$http_user_agent" "$http_x_forwarded_for" $scheme '
25 '"$http_accept_language" "$http_host" "$http_x_client_id" '
26 '$http_content_length "$http_content_type" $request_body';
21 27
22 access_log /var/log/nginx/access.log main; 28 access_log /var/log/nginx/access.log main;
23 server_tokens off; 29 server_tokens off;
24 30
25 sendfile <%= scope.lookupvar('nginx::params::sendfile')%>; 31 sendfile <%= scope.lookupvar('nginx::params::sendfile')%>;
26 32
27 <% if scope.lookupvar('nginx::params::tcp_nopush') == 'on' %> 33 <% if scope.lookupvar('nginx::params::tcp_nopush') == 'on' %>
28 tcp_nopush on; 34 tcp_nopush on;
29 <% end %> 35 <% end %>
30 36
(...skipping 24 matching lines...) Expand all
55 <% if @geoip_country %> 61 <% if @geoip_country %>
56 geoip_country <%= @geoip_country %>; 62 geoip_country <%= @geoip_country %>;
57 <% end %> 63 <% end %>
58 <% if @geoip_city %> 64 <% if @geoip_city %>
59 geoip_city <%= @geoip_city %>; 65 geoip_city <%= @geoip_city %>;
60 <% end %> 66 <% end %>
61 67
62 include /etc/nginx/conf.d/*.conf; 68 include /etc/nginx/conf.d/*.conf;
63 include /etc/nginx/sites-enabled/*; 69 include /etc/nginx/sites-enabled/*;
64 } 70 }
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld