Side by Side Diff: modules/nginx/manifests/init.pp
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
|
« manifests/webserver.pp ('k')
|
modules/nginx/templates/nginx.conf.erb » ('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 class nginx ( | 1 class nginx ( |
| 2 $worker_processes = $nginx::params::worker_processes, | 2 $worker_processes = $nginx::params::worker_processes, |
| 3 $worker_connections = $nginx::params::worker_connections, | 3 $worker_connections = $nginx::params::worker_connections, |
| 4 $ssl_session_cache = $nginx::params::ssl_session_cache | 4 $ssl_session_cache = $nginx::params::ssl_session_cache, |
| 5 $geoip_country = undef, | |
| 6 $geoip_city = undef, | |
| 5 ) inherits nginx::params { | 7 ) inherits nginx::params { |
| 6 | 8 |
| 7 apt::ppa {'ppa:nginx/stable': | 9 apt::ppa {'ppa:nginx/stable': |
| 8 } | 10 } |
| 9 | 11 |
| 10 apt::source {'nginx': | 12 apt::source {'nginx': |
| 11 ensure => 'absent', | 13 ensure => 'absent', |
| 12 } | 14 } |
| 13 | 15 |
| 14 # Ensures that nginx is not installed from the Ubuntu sources | 16 # Ensures that nginx is not installed from the Ubuntu sources |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 } | 173 } |
| 172 | 174 |
| 173 service {'nginx': | 175 service {'nginx': |
| 174 ensure => running, | 176 ensure => running, |
| 175 enable => true, | 177 enable => true, |
| 176 restart => '/etc/init.d/nginx reload', | 178 restart => '/etc/init.d/nginx reload', |
| 177 hasstatus => true, | 179 hasstatus => true, |
| 178 require => File['/etc/nginx/nginx.conf'] | 180 require => File['/etc/nginx/nginx.conf'] |
| 179 } | 181 } |
| 180 } | 182 } |
| OLD | NEW |
« no previous file with comments
|
« manifests/webserver.pp ('k')
|
modules/nginx/templates/nginx.conf.erb » ('j')
|
no next file with comments »
