Adjusted mission portal httpd.conf validation to show errors when they occur

Ticket: ENT-12653
Changelog: title
(cherry picked from commit 141afd51f82517a3f10285b46c1db609d3cd9ff2)

Author: craigcomstock

cfe_internal/enterprise/mission_portal.cf

@@ -284,11 +284,19 @@ bundle agent mission_portal_apache_from_stage(config, staged_config)
         expression => returnszero("$(paths.systemctl) -q is-active cf-apache > /dev/null 2>&1", "useshell"),
         if => fileexists( $(paths.systemctl) );
 
+      "httpd_config_validated"
+        expression => strcmp("$(validate_result[exit_code])", "0");
+      "httpd_config_error"
+        expression => not(strcmp("$(validate_result[exit_code])", "0"));
+
   vars:
 
       "validate_config"
         string => "$(sys.workdir)/httpd/bin/httpd -t -f $(staged_config)";
 
+      "validate_result"
+        data => execresult_as_data("$(validate_config)", "useshell", "both");
+
       # The location of the apache pid file moved from httpd/logs/httpd.pid to
       # httpd/httpd.pid in 3.15.5, 3.18.1 and, 3.19.0
 
@@ -311,7 +319,7 @@ bundle agent mission_portal_apache_from_stage(config, staged_config)
       if => and( or( "apache_stop_after_new_staged_config_repaired",
                      not( fileexists( "$(httpd_pid_file)" ) ),
                      isnewerthan( $(config), $(staged_config) ) ),
-                 returnszero("$(validate_config) > /dev/null 2>&1 ", "useshell")),
+                     "httpd_config_validated"),
       classes => results("bundle", "mission_portal_apache_config"),
       comment => "We make sure that the deployed config is a copy of the staged
                   config if the staged config passes a syntax check. We redirect
@@ -328,7 +336,7 @@ bundle agent mission_portal_apache_from_stage(config, staged_config)
     !systemd_supervised::
       "LD_LIBRARY_PATH=$(sys.workdir)/lib:$LD_LIBRARY_PATH $(sys.workdir)/httpd/bin/apachectl"
         args => "stop",
-        if => and( returnszero("$(validate_config) > /dev/null 2>&1 ", "useshell"),
+        if => and( "httpd_config_validated",
                    isnewerthan( $(staged_config), $(config) ),
                    fileexists( "$(httpd_pid_file)" ) ),
         contain => in_shell,
@@ -355,7 +363,8 @@ bundle agent mission_portal_apache_from_stage(config, staged_config)
     systemd_supervised::
       "cf-apache"
         service_policy => "stop",
-        if => and( returnszero("$(validate_config) > /dev/null 2>&1 ", "useshell"),
+        if => and( "httpd_config_validated",
+
                    isnewerthan( $(staged_config), $(config) ) ),
         classes => results( "bundle", "apache_stop_after_new_staged_config" ),
         comment => concat( "We have to stop apache before trying to start with a",
@@ -375,12 +384,14 @@ bundle agent mission_portal_apache_from_stage(config, staged_config)
         comment => "We restart apache after the new valid config is in place";
 
   reports:
+    httpd_config_error::
+      "'$(staged_config)' failed to validate: $(validate_result[output])";
     DEBUG|DEBUG_mission_portal_apache_from_stage::
       "DEBUG $(this.bundle): '$(config)' should be a copy of '$(staged_config)' because it validates with '$(validate_config)'"
-      if => returnszero("$(validate_config) > /dev/null 2>&1 ", "useshell");
+      if => "httpd_config_validated";
 
       "DEBUG $(this.bundle): '$(config)' should *not* be a copy of '$(staged_config)' because it failed to validate with '$(validate_config)'"
-      if => not(returnszero("$(validate_config) > /dev/null 2>&1 ", "useshell"));
+      if => not( "httpd_config_validated" );
 }
 
 ##################################################################