Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/nginx/manifests/init.pp

Issue 10630004: Make all our applications work with Nginx 1.4.1 (Closed)
Patch Set: Created May 22, 2013, 4:47 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 => "A524C53E", 12 key => "ABF5BD827BD9BF62",
13 key_source => "http://sysoev.ru/pgp.txt" 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-full': 17 package {'nginx-common':
18 ensure => purged, 18 ensure => purged,
19 before => Package['nginx'] 19 before => Package['nginx']
Wladimir Palant 2013/05/22 06:22:31 Will this uninstall nginx-full as well?
Felix Dahlke 2013/05/22 06:59:49 Yes. I tried to purge nginx-full originally, but t
20 } 20 }
21 21
22 package {'nginx': 22 package {'nginx':
23 ensure => '1.4.1-1~precise', 23 ensure => '1.4.1-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,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 } 78 }
79 79
80 service {'nginx': 80 service {'nginx':
81 ensure => running, 81 ensure => running,
82 enable => true, 82 enable => true,
83 restart => '/etc/init.d/nginx reload', 83 restart => '/etc/init.d/nginx reload',
84 hasstatus => true, 84 hasstatus => true,
85 require => File['/etc/nginx/nginx.conf'] 85 require => File['/etc/nginx/nginx.conf']
86 } 86 }
87 } 87 }
OLDNEW

Powered by Google App Engine
This is Rietveld