From a529a407e62e61ae641d2f283721b2911925eccf Mon Sep 17 00:00:00 2001
From: Victor Passapera <vpassapera@gmail.com>
Date: Tue, 9 Sep 2014 11:28:38 -0700
Subject: [PATCH] Update vhost.pp

Getting duplicate declaration errors for logroots managed from puppet and *not* apache even though it tries to create it if not defined.
---
 manifests/vhost.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 730ed0585..0f5c6182b 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -35,6 +35,7 @@
   $directoryindex              = '',
   $vhost_name                  = '*',
   $logroot                     = $::apache::logroot,
+  $manage_logroot              = true,
   $logroot_ensure              = 'directory',
   $logroot_mode                = undef,
   $log_level                   = undef,
@@ -225,7 +226,7 @@
   }
 
   # Same as above, but for logroot
-  if ! defined(File[$logroot]) {
+  if ! defined(File[$logroot]) and $manage_logroot {
     file { $logroot:
       ensure  => $logroot_ensure,
       mode    => $logroot_mode,