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

Revert "Require base folder for resources"

Browse source
This commit is contained in:
Matthew Haughton 2015-06-12 22:05:09 -04:00
parent e87bdfafda
commit 7733db5432
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
manifests/resource/upstream.pp
View file

@ -68,9 +68,8 @@ 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

9
manifests/resource/vhost.pp
View file

@ -518,11 +518,10 @@ define nginx::resource::vhost (
} }
concat { $config_file: concat { $config_file:
owner => $owner, owner => $owner,
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)