| 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': | |
| 17 command => '/usr/bin/apt-get -y purge nginx', | |
| 18 logoutput => true, | |
| 19 path => '/usr/sbin:/usr/bin:/sbin:/bin', | |
| 20 refreshonly => true, | |
| 21 returns => [0, 100], | |
| 22 subscribe => Apt::Ppa['ppa:nginx/stable'], | |
| 23 } | |
| 24 | |
| 25 package {'nginx': | 16 package {'nginx': |
| 26 ensure => '1.8.0-1+precise1', | 17 ensure => '1.8.0-1+precise1', |
| 27 require => Exec['purge-nginx'], | 18 require => Apt::Ppa['ppa:nginx/stable'], |
| 28 } | 19 } |
| 29 | 20 |
| 30 user {'nginx': | 21 user {'nginx': |
| 31 ensure => 'present', | 22 ensure => 'present', |
| 32 require => Package['nginx'], | 23 require => Package['nginx'], |
| 33 } | 24 } |
| 34 | 25 |
| 35 File { | 26 File { |
| 36 owner => root, | 27 owner => root, |
| 37 group => root, | 28 group => root, |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 } | 178 } |
| 188 | 179 |
| 189 service {'nginx': | 180 service {'nginx': |
| 190 ensure => running, | 181 ensure => running, |
| 191 enable => true, | 182 enable => true, |
| 192 restart => '/etc/init.d/nginx reload', | 183 restart => '/etc/init.d/nginx reload', |
| 193 hasstatus => true, | 184 hasstatus => true, |
| 194 require => File['/etc/nginx/nginx.conf'] | 185 require => File['/etc/nginx/nginx.conf'] |
| 195 } | 186 } |
| 196 } | 187 } |
| OLD | NEW |