diff --git a/manifests/custom_config.pp b/manifests/custom_config.pp index 543ace94e..cadc2354d 100644 --- a/manifests/custom_config.pp +++ b/manifests/custom_config.pp @@ -5,7 +5,7 @@ $content = undef, $priority = '25', $source = undef, - $verify_command = '/usr/sbin/apachectl -t', + $verify_command = $::apache::params::verify_command, $verify_config = true, ) { diff --git a/manifests/params.pp b/manifests/params.pp index 07bbf530f..6c37f14ef 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -28,6 +28,11 @@ # The default error log level $log_level = 'warn' + if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' { + $verify_command = '/usr/sbin/apache2ctl -t' + } else { + $verify_command = '/usr/sbin/apachectl -t' + } if $::osfamily == 'RedHat' or $::operatingsystem == 'amazon' { $user = 'apache' $group = 'apache'