summaryrefslogtreecommitdiffstats
path: root/Services/apache
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2014-12-10 00:23:13 +0100
committerstartxfr <clarue@startx.fr>2014-12-10 00:23:13 +0100
commitb16fb60aebdc648c3811413f0f2e5b8b6fb3cf31 (patch)
tree157b4469db7a2ecafadb5bcb780e92ff11fc62be /Services/apache
parent76fbe43a8e1cb13cfe4a24bb78ac510a13c85651 (diff)
downloadphpmyadmin-b16fb60aebdc648c3811413f0f2e5b8b6fb3cf31.tar.gz
phpmyadmin-b16fb60aebdc648c3811413f0f2e5b8b6fb3cf31.tar.bz2
phpmyadmin-b16fb60aebdc648c3811413f0f2e5b8b6fb3cf31.tar.xz
phpmyadmin-b16fb60aebdc648c3811413f0f2e5b8b6fb3cf31.zip
ajout d'un titre affiché dans github + mis een palce var d'env pour apache
Diffstat (limited to 'Services/apache')
-rw-r--r--Services/apache/README.md5
-rw-r--r--Services/apache/sx/httpd.sh6
2 files changed, 9 insertions, 2 deletions
diff --git a/Services/apache/README.md b/Services/apache/README.md
index b42fdd0..d775b03 100644
--- a/Services/apache/README.md
+++ b/Services/apache/README.md
@@ -1,5 +1,6 @@
-# STARTX Services docker-images : PHP Webserver
-This container run apache on fedora server.
+# STARTX Services docker-images : Simple Webserver
+
+Container running httpd daemon under a fedora server
## Running from docker registry
diff --git a/Services/apache/sx/httpd.sh b/Services/apache/sx/httpd.sh
index 04f08b4..0220984 100644
--- a/Services/apache/sx/httpd.sh
+++ b/Services/apache/sx/httpd.sh
@@ -1,12 +1,18 @@
#!/bin/bash
export TERM=dumb
+export HTTPDCONF=/etc/httpd/conf.d/sx.conf
# Begin configuration before starting daemonized process
# and start generating host keys
function begin_config {
echo "=> Begin httpd configuration for host $HOSTNAME"
mkdir -p /var/run/httpd
+ if [ -z "$DOCROOT" ]; then
+ echo "===> Changing document root to $DOCROOT"
+ ${DOCROOT=/var/www/html}
+ echo "DocumentRoot \"$DOCROOT\"" >> $HTTPDCONF
+ fi
}
# End configuration process just before starting daemon