opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #624 from Tombar/master

Browse source 
Require base folder for resources
This commit is contained in:
Matthew Haughton 2015-05-26 12:05:09 -04:00
commit 796bf63893
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manifests/resource/upstream.pp
View file

@ -70,6 +70,7 @@ define nginx::resource::upstream (
concat { "${::nginx::config::conf_dir}/conf.d/${name}-upstream.conf": concat { "${::nginx::config::conf_dir}/conf.d/${name}-upstream.conf":
ensure => $ensure_real, ensure => $ensure_real,
notify => Class['::nginx::service'], notify => Class['::nginx::service'],
require => File["${::nginx::config::conf_dir}/conf.d"]
} }
# Uses: $name, $upstream_cfg_prepend # Uses: $name, $upstream_cfg_prepend

1
manifests/resource/vhost.pp
View file

@ -510,6 +510,7 @@ define nginx::resource::vhost (
group => $group, group => $group,
mode => $mode, mode => $mode,
notify => Class['::nginx::service'], notify => Class['::nginx::service'],
require => File[$vhost_dir]
} }
$ssl_only = ($ssl == true) and ($ssl_port == $listen_port) $ssl_only = ($ssl == true) and ($ssl_port == $listen_port)