modules/nginx/templates/nginx.conf.erb - Issue 29465608: #1574 - Update template syntax in nginx module

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified 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.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: modules/nginx/templates/nginx.conf.erb

===================================================================

--- a/modules/nginx/templates/nginx.conf.erb

+++ b/modules/nginx/templates/nginx.conf.erb

@@ -1,5 +1,5 @@

user <%= scope.lookupvar('nginx::params::user') %> <%= scope.lookupvar('nginx::params::group') %>;

-worker_processes <%= worker_processes %>;

+worker_processes <%= @worker_processes %>;

<% if scope.lookupvar('lsbdistcodename') == 'precise' -%>

include /etc/nginx/modules-enabled/*.conf;

<% end -%>

@@ -8,7 +8,7 @@

pid /var/run/nginx.pid;

events {

- worker_connections <%= worker_connections %>;

+ worker_connections <%= @worker_connections %>;

<% if scope.lookupvar('nginx::params::multi_accept') == 'on' %>multi_accept on;<% end %>

}

worker_rlimit_nofile <%= scope.lookupvar('nginx::params::worker_rlimit_nofile') %>;

@@ -51,7 +51,7 @@

ssl_ciphers "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH EDH+aRSA -3DES DES-CBC3-SHA !aNULL !eNULL !LOW !MD5 !EXP !PSK !SRP !DSS !RC4";

ssl_prefer_server_ciphers on;

ssl_protocols TLSv1 TLSv1.1 TLSv1.2;

- <% if ssl_session_cache == 'on' %>

+ <% if @ssl_session_cache == 'on' %>

ssl_session_cache shared:SSL:1m;

<% else %>

ssl_session_cache off;

« no previous file with comments | « modules/nginx/templates/logrotate.erb ('k') | modules/nginx/templates/site.erb » ('j') | no next file with comments »