modules/nginx/templates/nginx.conf.erb - Issue 10630004: Make all our applications work with Nginx 1.4.1

Side by Side Diff

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

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

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

Issue 10630004: Make all our applications work with Nginx 1.4.1 (Closed)

Patch Set: Created May 22, 2013, 4:47 a.m.

Left:
Right:

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

Jump to:

View unified diff | Download patch

OLD	NEW
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 }

(...skipping 27 matching lines...) Expand all Loading...
38 <% end %>	38 <% end %>

39	39

40 ssl_ciphers RC4:ALL:-LOW:-EXPORT:!aNULL:!aECDH:!MD5;	40 ssl_ciphers RC4:ALL:-LOW:-EXPORT:!aNULL:!aECDH:!MD5;

41 ssl_prefer_server_ciphers on;	41 ssl_prefer_server_ciphers on;

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

43 ssl_session_cache shared:SSL:1m;	43 ssl_session_cache shared:SSL:1m;

44 <% end %>	44 <% end %>

45	45

46 types_hash_max_size 2048;	46 types_hash_max_size 2048;

47	47

	48 server_names_hash_bucket_size 64;
	Felix Dahlke 2013/05/22 04:50:28 This was necessary for intraforum.adblockplus.org. This was necessary for intraforum.adblockplus.org. I'm surprised it wasn't there, as I remember changing that in the past.
	49

48 include /etc/nginx/conf.d/*.conf;	50 include /etc/nginx/conf.d/*.conf;

49 include /etc/nginx/sites-enabled/*;	51 include /etc/nginx/sites-enabled/*;

50 }	52 }

OLD	NEW

« modules/nginx/manifests/init.pp ('K') | « modules/nginx/manifests/init.pp ('k') | no next file » | no next file with comments »