| 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 ) inherits nginx::params { | 5 ) inherits nginx::params { |
| 6 | 6 |
| 7 include apt | 7 include apt |
| 8 | 8 |
| 9 apt::source {'nginx': | 9 apt::source {'nginx': |
| 10 location => "http://nginx.org/packages/ubuntu", | 10 location => "http://nginx.org/packages/ubuntu", |
| 11 repos => "nginx", | 11 repos => "nginx", |
| 12 key => "ABF5BD827BD9BF62", | 12 key => "ABF5BD827BD9BF62", |
| 13 key_source => "http://nginx.org/keys/nginx_signing.key" | 13 key_source => "http://nginx.org/keys/nginx_signing.key" |
| 14 } | 14 } |
| 15 | 15 |
| 16 # Ensures that nginx is not installed from the Ubuntu sources | 16 # Ensures that nginx is not installed from the Ubuntu sources |
| 17 package {'nginx-common': | 17 package {'nginx-common': |
| 18 ensure => purged, | 18 ensure => purged, |
| 19 before => Package['nginx'] | 19 before => Package['nginx'] |
| 20 } | 20 } |
| 21 | 21 |
| 22 package {'nginx': | 22 package {'nginx': |
| 23 ensure => '1.4.5-1~precise', | 23 ensure => '1.4.6-1~precise', |
| 24 require => Apt::Source['nginx'] | 24 require => Apt::Source['nginx'] |
| 25 } | 25 } |
| 26 | 26 |
| 27 File { | 27 File { |
| 28 owner => root, | 28 owner => root, |
| 29 group => root, | 29 group => root, |
| 30 mode => 0644, | 30 mode => 0644, |
| 31 } | 31 } |
| 32 | 32 |
| 33 file {'/etc/nginx/nginx.conf': | 33 file {'/etc/nginx/nginx.conf': |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 } | 84 } |
| 85 | 85 |
| 86 service {'nginx': | 86 service {'nginx': |
| 87 ensure => running, | 87 ensure => running, |
| 88 enable => true, | 88 enable => true, |
| 89 restart => '/etc/init.d/nginx reload', | 89 restart => '/etc/init.d/nginx reload', |
| 90 hasstatus => true, | 90 hasstatus => true, |
| 91 require => File['/etc/nginx/nginx.conf'] | 91 require => File['/etc/nginx/nginx.conf'] |
| 92 } | 92 } |
| 93 } | 93 } |
| OLD | NEW |