Side by Side Diff: modules/nginx/manifests/init.pp
Issue 4615235449126912:
Issue 2327 - Nginx apt key is added on every provisioning (Closed)
Patch Set:
Created April 16, 2015, 12:04 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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 apt::source {'nginx': | 7 apt::source {'nginx': |
| 8 location => "http://nginx.org/packages/ubuntu", | 8 location => "http://nginx.org/packages/ubuntu", |
| 9 repos => "nginx", | 9 repos => "nginx", |
| 10 key => "ABF5BD827BD9BF62", | 10 key => "7BD9BF62", |
| 11 key_source => "http://nginx.org/keys/nginx_signing.key" | 11 key_source => "http://nginx.org/keys/nginx_signing.key" |
| 12 } | 12 } |
| 13 | 13 |
| 14 # Ensures that nginx is not installed from the Ubuntu sources | 14 # Ensures that nginx is not installed from the Ubuntu sources |
| 15 package {'nginx-common': | 15 package {'nginx-common': |
| 16 ensure => purged, | 16 ensure => purged, |
| 17 before => Package['nginx'] | 17 before => Package['nginx'] |
| 18 } | 18 } |
| 19 | 19 |
| 20 package {'nginx': | 20 package {'nginx': |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 120 } | 120 } |
| 121 | 121 |
| 122 service {'nginx': | 122 service {'nginx': |
| 123 ensure => running, | 123 ensure => running, |
| 124 enable => true, | 124 enable => true, |
| 125 restart => '/etc/init.d/nginx reload', | 125 restart => '/etc/init.d/nginx reload', |
| 126 hasstatus => true, | 126 hasstatus => true, |
| 127 require => File['/etc/nginx/nginx.conf'] | 127 require => File['/etc/nginx/nginx.conf'] |
| 128 } | 128 } |
| 129 } | 129 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
