summaryrefslogtreecommitdiffstats
path: root/Services/apache/run.sh
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-11-28 19:46:13 +0100
committerstartxfr <clarue@startx.fr>2015-11-28 19:46:13 +0100
commit348568c89ae1ad19270e930c02a1492bc43e99b1 (patch)
tree97514774d5c27789d9383f5085103eb9775b6a52 /Services/apache/run.sh
parent05c9aa4a4d3572168878bf0e81eeac724a95454d (diff)
downloadphpmyadmin-348568c89ae1ad19270e930c02a1492bc43e99b1.tar.gz
phpmyadmin-348568c89ae1ad19270e930c02a1492bc43e99b1.tar.bz2
phpmyadmin-348568c89ae1ad19270e930c02a1492bc43e99b1.tar.xz
phpmyadmin-348568c89ae1ad19270e930c02a1492bc43e99b1.zip
Adding display of OS flavour at startup and improving flexibility of services with env param
Diffstat (limited to 'Services/apache/run.sh')
-rw-r--r--Services/apache/run.sh15
1 files changed, 6 insertions, 9 deletions
diff --git a/Services/apache/run.sh b/Services/apache/run.sh
index a02537e..026c618 100644
--- a/Services/apache/run.sh
+++ b/Services/apache/run.sh
@@ -1,6 +1,4 @@
#!/bin/bash
-export HTTPDCONF=/etc/httpd/conf.d/app.conf
-
source /bin/sx-lib.sh
source /bin/sx-httpd.sh
@@ -8,10 +6,9 @@ if [[ "$0" == *"run.sh" && ! $1 = "" ]];then
eval "$@";
fi
-check_environment
-check_httpd_environment
-display_container_httpd_header
-begin_config
-end_config
-display_container_started
-start_daemon
+check_environment | tee -a $STARTUPLOG
+check_httpd_environment | tee -a $STARTUPLOG
+display_container_httpd_header | tee -a $STARTUPLOG
+begin_config | tee -a $STARTUPLOG
+end_config | tee -a $STARTUPLOG
+start_daemon | tee -a $STARTUPLOG