Merge pull request 'override ssl.conf when using http config' (#63) from docker_fix_conf into master

Reviewed-on: https://git.lolcat.ca/lolcat/4get/pulls/63

5 files changed, 15 insertions, 5 deletions

diff --git a/docker/apache/http/conf.d/ssl.conf b/docker/apache/http/conf.d/ssl.conf
new file mode 100644
index 0000000..1357f56
--- /dev/null
+++ b/docker/apache/http/conf.d/ssl.conf
@@ -0,0 +1 @@
+# intentionally blank
diff --git a/docker/apache/http.conf b/docker/apache/http/httpd.conf
index f496ba5..f496ba5 100644
--- a/docker/apache/http.conf
+++ b/docker/apache/http/httpd.conf
diff --git a/docker/apache/conf.d/ssl.conf b/docker/apache/https/conf.d/ssl.conf
index 7b0dd15..7b0dd15 100644
--- a/docker/apache/conf.d/ssl.conf
+++ b/docker/apache/https/conf.d/ssl.conf
diff --git a/docker/apache/https.conf b/docker/apache/https/httpd.conf
index ca5edf5..ca5edf5 100644
--- a/docker/apache/https.conf
+++ b/docker/apache/https/httpd.conf
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 66d4067..53e7654 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -8,18 +8,27 @@ FOURGET_PROTO="${FOURGET_PROTO#\"}"
 # make lowercase
 FOURGET_PROTO=`echo $FOURGET_PROTO | awk '{print tolower($0)}'`
 
+FOURGET_SRC='/var/www/html/4get'
+
+mkdir -p /etc/apache2
 
 if [ "$FOURGET_PROTO" = "https" ]; then
         echo "Using https configuration"
-        cp /etc/apache2/https.conf /etc/apache2/httpd.conf
+        cp -r ${FOURGET_SRC}/docker/apache/https/httpd.conf /etc/apache2
+        cp -r ${FOURGET_SRC}/docker/apache/https/conf.d/* /etc/apache2/conf.d
+
 else
         echo "Using http configuration"
-        cp /etc/apache2/http.conf /etc/apache2/httpd.conf
+        cp -r ${FOURGET_SRC}/docker/apache/http/httpd.conf /etc/apache2
+        cp -r ${FOURGET_SRC}/docker/apache/http/conf.d/* /etc/apache2/conf.d
 fi
 
 php ./docker/gen_config.php
 
-
-echo "4get is running"
-exec httpd -DFOREGROUND
+if [ "$@" = "start" ]; then
+        echo "4get is running"
+        exec httpd -DFOREGROUND
+else 
+        exec "$@"
+fi