Merge pull request #844 from vpassapera/patch-1

Fix duplicate declarations when puppet manages logroot for vhosts
redhat-openstack · Sep 26, 2014 · df1b4d5 · df1b4d5
2 parents 3782afd + a529a40
commit df1b4d5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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,