From 0f2a0b33dd5399219fd37ffdde8bde335c7da246 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Mon, 29 Sep 2014 15:25:21 -0500
Subject: [PATCH] Fix custom_config check for ubuntu precise.

---
 manifests/custom_config.pp | 2 +-
 manifests/params.pp        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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'