Left: | ||
Right: |
LEFT | RIGHT |
---|---|
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 # Class['ssh'] is assumed to handle SSL-related quirks and therefore | 9 # Class['ssh'] is assumed to handle SSL-related quirks and therefore |
10 # the inclusion here became necessary. | 10 # the inclusion here became necessary. |
(...skipping 25 matching lines...) Expand all Loading... | |
36 | 36 |
37 if $::operatingsystem == 'Debian' { | 37 if $::operatingsystem == 'Debian' { |
38 | 38 |
39 apt::key {'nginx': | 39 apt::key {'nginx': |
40 key => 'ABF5BD827BD9BF62', | 40 key => 'ABF5BD827BD9BF62', |
41 key_content => template('nginx/apt.key.erb'), | 41 key_content => template('nginx/apt.key.erb'), |
42 } | 42 } |
43 | 43 |
44 apt::source {'nginx': | 44 apt::source {'nginx': |
45 before => Package['nginx'], | 45 before => Package['nginx'], |
46 location => 'http://nginx.org/packages/mainline/debian/', | 46 location => 'https://nginx.org/packages/mainline/debian/', |
Fred
2017/01/03 15:09:46
Since we added "apt-transport-https" in the Vagran
f.lopez
2017/01/03 16:34:24
Nice catch, ack
| |
47 release => downcase($::lsbdistcodename), | 47 release => downcase($::lsbdistcodename), |
48 repos => 'nginx', | 48 repos => 'nginx', |
49 require => Apt::Key['nginx'], | 49 require => Apt::Key['nginx'], |
50 } | 50 } |
51 } | 51 } |
52 | 52 |
53 user {'nginx': | 53 user {'nginx': |
54 ensure => 'present', | 54 ensure => 'present', |
55 require => Package['nginx'], | 55 require => Package['nginx'], |
56 } | 56 } |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
237 | 237 |
238 Service['nginx'] <~ Class['ssh'] | 238 Service['nginx'] <~ Class['ssh'] |
239 | 239 |
240 file {'/usr/share/nginx/html/50x.html': | 240 file {'/usr/share/nginx/html/50x.html': |
241 mode => 0644, | 241 mode => 0644, |
242 owner => 'root', | 242 owner => 'root', |
243 require => Package['nginx'], | 243 require => Package['nginx'], |
244 source => 'puppet:///modules/nginx/50x.html', | 244 source => 'puppet:///modules/nginx/50x.html', |
245 } | 245 } |
246 } | 246 } |
LEFT | RIGHT |