| 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 } |
| 11 | 11 |
| 12 apt::source {'nginx': | 12 apt::source {'nginx': |
| 13 ensure => 'absent', | 13 ensure => 'absent', |
| 14 } | 14 } |
| 15 | 15 |
| 16 exec {'purge-nginx': | 16 exec {'purge-nginx': |
| 17 command => '/usr/bin/apt-get -y purge nginx', | 17 command => '/usr/bin/apt-get -y purge nginx', |
| 18 logoutput => true, | 18 logoutput => true, |
| 19 path => '/usr/sbin:/usr/bin:/sbin:/bin', | 19 path => '/usr/sbin:/usr/bin:/sbin:/bin', |
| 20 refreshonly => true, | 20 refreshonly => true, |
| 21 returns => [0, 100], | 21 returns => [0, 100], |
| 22 subscribe => Apt::Ppa['ppa:nginx/stable'], | 22 subscribe => Apt::Ppa['ppa:nginx/stable'], |
| 23 } | 23 } |
| 24 | 24 |
| 25 package {'nginx': | 25 package {'nginx': |
| 26 ensure => '1.10.1-0+precise0', | 26 ensure => '1.10.1-3+precise3', |
| 27 require => Exec['purge-nginx'], | 27 require => Exec['purge-nginx'], |
| 28 } | 28 } |
| 29 | 29 |
| 30 user {'nginx': | 30 user {'nginx': |
| 31 ensure => 'present', | 31 ensure => 'present', |
| 32 require => Package['nginx'], | 32 require => Package['nginx'], |
| 33 } | 33 } |
| 34 | 34 |
| 35 File { | 35 File { |
| 36 owner => root, | 36 owner => root, |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 require => Package['nginx'], | 212 require => Package['nginx'], |
| 213 } | 213 } |
| 214 | 214 |
| 215 file {'/usr/share/nginx/html/50x.html': | 215 file {'/usr/share/nginx/html/50x.html': |
| 216 mode => 0644, | 216 mode => 0644, |
| 217 owner => 'root', | 217 owner => 'root', |
| 218 require => Package['nginx'], | 218 require => Package['nginx'], |
| 219 source => 'puppet:///modules/nginx/50x.html', | 219 source => 'puppet:///modules/nginx/50x.html', |
| 220 } | 220 } |
| 221 } | 221 } |
| OLD | NEW |