Side by Side Diff: modules/nginx/templates/nginx.conf.erb
Issue 29373603:
Noissue - Ensure Nginx modules being loaded in old Ubuntu precise setups (Closed)
Patch Set:
Created Jan. 24, 2017, 5:55 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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 <% if scope.lookupvar('lsbdistcodename') == 'precise' -%> | |
| 4 include /etc/nginx/modules-enabled/*.conf; | |
| 5 <% end -%> | |
| 3 | 6 |
| 4 error_log /var/log/nginx/error.log notice; | 7 error_log /var/log/nginx/error.log notice; |
| 5 pid /var/run/nginx.pid; | 8 pid /var/run/nginx.pid; |
| 6 | 9 |
| 7 events { | 10 events { |
| 8 worker_connections <%= worker_connections %>; | 11 worker_connections <%= worker_connections %>; |
| 9 <% 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 %> |
| 10 } | 13 } |
| 11 worker_rlimit_nofile <%= scope.lookupvar('nginx::params::worker_rlimit_nofile') %>; | 14 worker_rlimit_nofile <%= scope.lookupvar('nginx::params::worker_rlimit_nofile') %>; |
| 12 | 15 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 61 <% if @geoip_country %> | 64 <% if @geoip_country %> |
| 62 geoip_country <%= @geoip_country %>; | 65 geoip_country <%= @geoip_country %>; |
| 63 <% end %> | 66 <% end %> |
| 64 <% if @geoip_city %> | 67 <% if @geoip_city %> |
| 65 geoip_city <%= @geoip_city %>; | 68 geoip_city <%= @geoip_city %>; |
| 66 <% end %> | 69 <% end %> |
| 67 | 70 |
| 68 include /etc/nginx/conf.d/*.conf; | 71 include /etc/nginx/conf.d/*.conf; |
| 69 include /etc/nginx/sites-enabled/*; | 72 include /etc/nginx/sites-enabled/*; |
| 70 } | 73 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
