Merge pull request #873 from mhaskel/custom_config_fix

Fix custom_config check for ubuntu precise.
redhat-openstack · Sep 29, 2014 · 5bb6b94 · 5bb6b94
2 parents 19ce43f + 0f2a0b3
commit 5bb6b94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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'