Skip to content

Commit

Permalink
Revert "Fix duplicate declarations when puppet manages logroot for vh…
Browse files Browse the repository at this point in the history
…osts"
  • Loading branch information
Morgan Haskel committed Sep 26, 2014
1 parent df1b4d5 commit 7a87768
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions manifests/vhost.pp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
$directoryindex = '',
$vhost_name = '*',
$logroot = $::apache::logroot,
$manage_logroot = true,
$logroot_ensure = 'directory',
$logroot_mode = undef,
$log_level = undef,
Expand Down Expand Up @@ -226,7 +225,7 @@
}

# Same as above, but for logroot
if ! defined(File[$logroot]) and $manage_logroot {
if ! defined(File[$logroot]) {
file { $logroot:
ensure => $logroot_ensure,
mode => $logroot_mode,
Expand Down

0 comments on commit 7a87768

Please sign in to comment.