Side by Side Diff: modules/nginx/templates/nginx.conf.erb
Issue 29326153:
Issue 3011 - Integrate GeoIP with Nginx configuration (Closed)
Patch Set:
Created Sept. 8, 2015, 6:19 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/nginx/manifests/init.pp ('k')
|
modules/web/manifests/server.pp » ('j')
|
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 | 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 45 <% if ssl_session_cache == 'on' %> | 45 <% if ssl_session_cache == 'on' %> |
| 46 ssl_session_cache shared:SSL:1m; | 46 ssl_session_cache shared:SSL:1m; |
| 47 <% else %> | 47 <% else %> |
| 48 ssl_session_cache off; | 48 ssl_session_cache off; |
| 49 <% end %> | 49 <% end %> |
| 50 | 50 |
| 51 types_hash_max_size 2048; | 51 types_hash_max_size 2048; |
| 52 | 52 |
| 53 server_names_hash_bucket_size 64; | 53 server_names_hash_bucket_size 64; |
| 54 | 54 |
| 55 <% if @geoip_country %> | |
| 56 geoip_country <%= @geoip_country %>; | |
| 57 <% end %> | |
| 58 <% if @geoip_city %> | |
| 59 geoip_city <%= @geoip_city %>; | |
| 60 <% end %> | |
| 61 | |
| 55 include /etc/nginx/conf.d/*.conf; | 62 include /etc/nginx/conf.d/*.conf; |
| 56 include /etc/nginx/sites-enabled/*; | 63 include /etc/nginx/sites-enabled/*; |
| 57 } | 64 } |
| OLD | NEW |
« no previous file with comments
|
« modules/nginx/manifests/init.pp ('k')
|
modules/web/manifests/server.pp » ('j')
|
no next file with comments »
