From 7733db5432c682af2b075db153e04c211fdefde9 Mon Sep 17 00:00:00 2001
From: Matthew Haughton <3flex@users.noreply.github.com>
Date: Fri, 12 Jun 2015 22:05:09 -0400
Subject: [PATCH] Revert "Require base folder for resources"

---
 manifests/resource/upstream.pp | 5 ++---
 manifests/resource/vhost.pp    | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/manifests/resource/upstream.pp b/manifests/resource/upstream.pp
index bfdfa3a..c74492a 100644
--- a/manifests/resource/upstream.pp
+++ b/manifests/resource/upstream.pp
@@ -68,9 +68,8 @@ define nginx::resource::upstream (
   }
 
   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
index 95a55f5..629be52 100644
--- a/manifests/resource/vhost.pp
+++ b/manifests/resource/vhost.pp
@@ -518,11 +518,10 @@ define nginx::resource::vhost (
   }
 
   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)