Side by Side Diff: modules/nginx/manifests/init.pp
Issue 29328668:
Issue 3115 - Introduce custom HTTP 50x error page (Closed)
Patch Set:
Created Sept. 25, 2015, 1:54 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/files/50x.html ('k')
|
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 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, | 5 $geoip_country = undef, |
| 6 $geoip_city = undef, | 6 $geoip_city = undef, |
| 7 ) inherits nginx::params { | 7 ) inherits nginx::params { |
| 8 | 8 |
| 9 apt::ppa {'ppa:nginx/stable': | 9 apt::ppa {'ppa:nginx/stable': |
| 10 } | 10 } |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 186 subscribe => Service['nginx'], | 186 subscribe => Service['nginx'], |
| 187 } | 187 } |
| 188 | 188 |
| 189 service {'nginx': | 189 service {'nginx': |
| 190 ensure => running, | 190 ensure => running, |
| 191 enable => true, | 191 enable => true, |
| 192 restart => '/etc/init.d/nginx reload', | 192 restart => '/etc/init.d/nginx reload', |
| 193 hasstatus => true, | 193 hasstatus => true, |
| 194 require => File['/etc/nginx/nginx.conf'] | 194 require => File['/etc/nginx/nginx.conf'] |
| 195 } | 195 } |
| 196 | |
| 197 file {'/usr/share/nginx/html/50x.html': | |
| 198 mode => 0644, | |
| 199 owner => 'root', | |
| 200 require => Package['nginx'], | |
| 201 source => 'puppet:///modules/nginx/50x.html', | |
| 202 } | |
| 196 } | 203 } |
| OLD | NEW |
« no previous file with comments
|
« modules/nginx/files/50x.html ('k')
|
no next file »
|
no next file with comments »
