Merge branch 'master' of https://github.com/jfryman/puppet-nginx
This commit is contained in:
commit
5f69bd3c3a
1 changed files with 0 additions and 2 deletions
|
@ -213,12 +213,10 @@ define nginx::resource::vhost (
|
||||||
# Check if the file has been defined before creating the file to
|
# Check if the file has been defined before creating the file to
|
||||||
# avoid the error when using wildcard cert on the multiple vhosts
|
# avoid the error when using wildcard cert on the multiple vhosts
|
||||||
ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.crt", {
|
ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.crt", {
|
||||||
ensure => $ensure,
|
|
||||||
mode => '0644',
|
mode => '0644',
|
||||||
source => $ssl_cert,
|
source => $ssl_cert,
|
||||||
})
|
})
|
||||||
ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.key", {
|
ensure_resource('file', "${nginx::params::nx_conf_dir}/${cert}.key", {
|
||||||
ensure => $ensure,
|
|
||||||
mode => '0644',
|
mode => '0644',
|
||||||
source => $ssl_key,
|
source => $ssl_key,
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue