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 $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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 } | 71 } |
72 | 72 |
73 concat::fragment {'nginx.conf#main': | 73 concat::fragment {'nginx.conf#main': |
74 content => template('nginx/nginx.conf.erb'), | 74 content => template('nginx/nginx.conf.erb'), |
75 notify => Service['nginx'], | 75 notify => Service['nginx'], |
76 order => '10', | 76 order => '10', |
77 target => '/etc/nginx/nginx.conf', | 77 target => '/etc/nginx/nginx.conf', |
78 } | 78 } |
79 | 79 |
80 $modules = hiera_hash('nginx::modules', {}) | 80 $modules = hiera_hash('nginx::modules', {}) |
81 create_resources('nginx::module', $modules) | 81 ensure_resources('nginx::module', $modules, { |
| 82 ensure => 'present', |
| 83 }) |
82 | 84 |
83 file {'/etc/nginx/sites-available': | 85 file {'/etc/nginx/sites-available': |
84 ensure => directory, | 86 ensure => directory, |
85 require => Package['nginx'] | 87 require => Package['nginx'] |
86 } | 88 } |
87 | 89 |
88 file {'/etc/nginx/sites-enabled': | 90 file {'/etc/nginx/sites-enabled': |
89 ensure => directory, | 91 ensure => directory, |
90 require => Package['nginx'] | 92 require => Package['nginx'] |
91 } | 93 } |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 | 244 |
243 Service['nginx'] <~ Class['ssh'] | 245 Service['nginx'] <~ Class['ssh'] |
244 | 246 |
245 file {'/usr/share/nginx/html/50x.html': | 247 file {'/usr/share/nginx/html/50x.html': |
246 mode => '0644', | 248 mode => '0644', |
247 owner => 'root', | 249 owner => 'root', |
248 require => Package['nginx'], | 250 require => Package['nginx'], |
249 source => 'puppet:///modules/nginx/50x.html', | 251 source => 'puppet:///modules/nginx/50x.html', |
250 } | 252 } |
251 } | 253 } |
OLD | NEW |