From 7b3b27e440b076f7a599555eaf963e719caab080 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Sat, 28 Nov 2015 21:04:24 +0100
Subject: start reshape of mysql container

---
 Services/apache/run.sh      | 1 -
 Services/apache/sx-httpd.sh | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'Services/apache')

diff --git a/Services/apache/run.sh b/Services/apache/run.sh
index 026c618..e06a7c5 100644
--- a/Services/apache/run.sh
+++ b/Services/apache/run.sh
@@ -6,7 +6,6 @@ if [[ "$0" == *"run.sh" && ! $1 = "" ]];then
     eval "$@"; 
 fi
 
-check_environment | tee -a $STARTUPLOG
 check_httpd_environment | tee -a $STARTUPLOG
 display_container_httpd_header | tee -a $STARTUPLOG
 begin_config | tee -a $STARTUPLOG
diff --git a/Services/apache/sx-httpd.sh b/Services/apache/sx-httpd.sh
index c955689..fb50be9 100644
--- a/Services/apache/sx-httpd.sh
+++ b/Services/apache/sx-httpd.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 function check_httpd_environment {
+    check_environment
     if [ ! -v SERVER_NAME ]; then
         SERVER_NAME="localhost"
         export SERVER_NAME
@@ -25,6 +26,7 @@ function display_container_httpd_header {
     echo "+====================================================="
     echo "| Container   : $HOSTNAME"
     echo "| OS          : $(</etc/redhat-release)"
+    echo "| Engine      : " httpd -v | head -1
     if [ -v CONTAINER_TYPE ]; then
         echo "| Type        : $CONTAINER_TYPE"
     fi
-- 
cgit v1.2.3