summaryrefslogtreecommitdiffstats
path: root/Services/apache
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-11-28 21:04:24 +0100
committerstartxfr <clarue@startx.fr>2015-11-28 21:04:24 +0100
commit7b3b27e440b076f7a599555eaf963e719caab080 (patch)
tree1f6caa5506433de8850a66316abf1db80fc5ed01 /Services/apache
parent59bbf66b7b1e4490694f2c5f732ddf9380acf053 (diff)
downloadphpmyadmin-7b3b27e440b076f7a599555eaf963e719caab080.tar.gz
phpmyadmin-7b3b27e440b076f7a599555eaf963e719caab080.tar.bz2
phpmyadmin-7b3b27e440b076f7a599555eaf963e719caab080.tar.xz
phpmyadmin-7b3b27e440b076f7a599555eaf963e719caab080.zip
start reshape of mysql container
Diffstat (limited to 'Services/apache')
-rw-r--r--Services/apache/run.sh1
-rw-r--r--Services/apache/sx-httpd.sh2
2 files changed, 2 insertions, 1 deletions
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