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

Side by Side Diff: modules/nginx/templates/nginx.conf.erb

Issue 29465608: #1574 - Update template syntax in nginx module (Closed)
Patch Set: Created June 14, 2017, 12:39 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « modules/nginx/templates/logrotate.erb ('k') | modules/nginx/templates/site.erb » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <% if scope.lookupvar('lsbdistcodename') == 'precise' -%> 3 <% if scope.lookupvar('lsbdistcodename') == 'precise' -%>
4 include /etc/nginx/modules-enabled/*.conf; 4 include /etc/nginx/modules-enabled/*.conf;
5 <% end -%> 5 <% end -%>
6 6
7 error_log /var/log/nginx/error.log notice; 7 error_log /var/log/nginx/error.log notice;
8 pid /var/run/nginx.pid; 8 pid /var/run/nginx.pid;
9 9
10 events { 10 events {
11 worker_connections <%= worker_connections %>; 11 worker_connections <%= @worker_connections %>;
12 <% if scope.lookupvar('nginx::params::multi_accept') == 'on' %>multi_accept on ;<% end %> 12 <% if scope.lookupvar('nginx::params::multi_accept') == 'on' %>multi_accept on ;<% end %>
13 } 13 }
14 worker_rlimit_nofile <%= scope.lookupvar('nginx::params::worker_rlimit_nofile') %>; 14 worker_rlimit_nofile <%= scope.lookupvar('nginx::params::worker_rlimit_nofile') %>;
15 15
16 http { 16 http {
17 include /etc/nginx/mime.types; 17 include /etc/nginx/mime.types;
18 default_type application/octet-stream; 18 default_type application/octet-stream;
19 19
20 log_format main '$remote_addr - $remote_user [$time_local] "$request" ' 20 log_format main '$remote_addr - $remote_user [$time_local] "$request" '
21 '$status $bytes_sent "$http_referer" ' 21 '$status $bytes_sent "$http_referer" '
(...skipping 22 matching lines...) Expand all
44 gzip on; 44 gzip on;
45 gzip_disable "msie6"; 45 gzip_disable "msie6";
46 gzip_min_length 100; 46 gzip_min_length 100;
47 gzip_buffers 4 8k; 47 gzip_buffers 4 8k;
48 gzip_types text/plain text/xhtml text/css application/x-javascript text/xml ap plication/atom+xml application/rss+xml; 48 gzip_types text/plain text/xhtml text/css application/x-javascript text/xml ap plication/atom+xml application/rss+xml;
49 <% end %> 49 <% end %>
50 50
51 ssl_ciphers "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECD SA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH EDH+aRSA -3DES DES-CBC3-SHA !aNULL !eNULL !LOW !MD5 !EXP !PSK !SRP !DSS !RC4"; 51 ssl_ciphers "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECD SA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH EDH+aRSA -3DES DES-CBC3-SHA !aNULL !eNULL !LOW !MD5 !EXP !PSK !SRP !DSS !RC4";
52 ssl_prefer_server_ciphers on; 52 ssl_prefer_server_ciphers on;
53 ssl_protocols TLSv1 TLSv1.1 TLSv1.2; 53 ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
54 <% if ssl_session_cache == 'on' %> 54 <% if @ssl_session_cache == 'on' %>
55 ssl_session_cache shared:SSL:1m; 55 ssl_session_cache shared:SSL:1m;
56 <% else %> 56 <% else %>
57 ssl_session_cache off; 57 ssl_session_cache off;
58 <% end %> 58 <% end %>
59 59
60 types_hash_max_size 2048; 60 types_hash_max_size 2048;
61 61
62 server_names_hash_bucket_size 64; 62 server_names_hash_bucket_size 64;
63 63
64 <% if @geoip_country %> 64 <% if @geoip_country %>
65 geoip_country <%= @geoip_country %>; 65 geoip_country <%= @geoip_country %>;
66 <% end %> 66 <% end %>
67 <% if @geoip_city %> 67 <% if @geoip_city %>
68 geoip_city <%= @geoip_city %>; 68 geoip_city <%= @geoip_city %>;
69 <% end %> 69 <% end %>
70 70
71 include /etc/nginx/conf.d/*.conf; 71 include /etc/nginx/conf.d/*.conf;
72 include /etc/nginx/sites-enabled/*; 72 include /etc/nginx/sites-enabled/*;
73 } 73 }
OLDNEW
« no previous file with comments | « modules/nginx/templates/logrotate.erb ('k') | modules/nginx/templates/site.erb » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld