Merge pull request voxpupuli#643 from jfryman/revert-624-master

Revert "Require base folder for resources"
cegeka · Jun 13, 2015 · f1d82e0 · f1d82e0
2 parents 4a74552 + f200c85
commit f1d82e0
Show file tree

Hide file tree

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

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