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.7-1~precise', | 23 ensure => '1.6.0-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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 } | 122 } |
123 | 123 |
124 service {'nginx': | 124 service {'nginx': |
125 ensure => running, | 125 ensure => running, |
126 enable => true, | 126 enable => true, |
127 restart => '/etc/init.d/nginx reload', | 127 restart => '/etc/init.d/nginx reload', |
128 hasstatus => true, | 128 hasstatus => true, |
129 require => File['/etc/nginx/nginx.conf'] | 129 require => File['/etc/nginx/nginx.conf'] |
130 } | 130 } |
131 } | 131 } |
OLD | NEW |