Skip to content

Commit 7a87768

Browse files
author
Morgan Haskel
committed
Revert "Fix duplicate declarations when puppet manages logroot for vhosts"
1 parent df1b4d5 commit 7a87768

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

manifests/vhost.pp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
$directoryindex = '',
3636
$vhost_name = '*',
3737
$logroot = $::apache::logroot,
38-
$manage_logroot = true,
3938
$logroot_ensure = 'directory',
4039
$logroot_mode = undef,
4140
$log_level = undef,
@@ -226,7 +225,7 @@
226225
}
227226

228227
# Same as above, but for logroot
229-
if ! defined(File[$logroot]) and $manage_logroot {
228+
if ! defined(File[$logroot]) {
230229
file { $logroot:
231230
ensure => $logroot_ensure,
232231
mode => $logroot_mode,

0 commit comments

Comments
 (0)