Merge pull request voxpupuli#624 from Tombar/master

Require base folder for resources
cegeka · May 26, 2015 · 4e9f91b · 4e9f91b
2 parents 1f1e493 + 02aa7f5
commit 4e9f91b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/manifests/resource/upstream.pp b/manifests/resource/upstream.pp
@@ -68,8 +68,9 @@
   }
 
   concat { "${::nginx::config::conf_dir}/conf.d/${name}-upstream.conf":
-    ensure => $ensure_real,
-    notify => Class['::nginx::service'],
+    ensure  => $ensure_real,
+    notify  => Class['::nginx::service'],
+    require => File["${::nginx::config::conf_dir}/conf.d"]
   }
 
   # Uses: $name, $upstream_cfg_prepend

diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
@@ -506,10 +506,11 @@
   }
 
   concat { $config_file:
-    owner  => $owner,
-    group  => $group,
-    mode   => $mode,
-    notify => Class['::nginx::service'],
+    owner   => $owner,
+    group   => $group,
+    mode    => $mode,
+    notify  => Class['::nginx::service'],
+    require => File[$vhost_dir]
   }
 
   $ssl_only = ($ssl == true) and ($ssl_port == $listen_port)