update php and improve docker docs

1 files changed, 10 insertions, 5 deletions

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 0a41ddd..ca0c4bc 100755
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,14 +1,19 @@
 #!/bin/sh
 set -e
-if [ ! -f /etc/4get/certs/fullchain.pem ] || [ ! -f /etc/4get/certs/privkey.pem ]; then
-        echo "Using http configuration"
-        cp /etc/apache2/http.conf /etc/apache2/httpd.conf
-else
+
+# remove quotes from variable if present
+FOURGET_PROTO="${FOURGET_PROTO%\"}"
+FOURGET_PROTO="${FOURGET_PROTO#\"}"
+
+if [ "$FOURGET_PROTO" = "https" ] || [ -f /etc/4get/certs/fullchain.pem ] || [ -f /etc/4get/certs/privkey.pem ]; then
         echo "Using https configuration"
         cp /etc/apache2/https.conf /etc/apache2/httpd.conf
+else
+        echo "Using http configuration"
+        cp /etc/apache2/http.conf /etc/apache2/httpd.conf
 fi
 
-php82 ./docker/gen_config.php
+php ./docker/gen_config.php
 
 
 echo "4get is running"