allow to run this behind a reverse proxy

Signed-off-by: szaimen <szaimen@e.mail.de>

Containers/apache/Caddyfile

@@ -6,7 +6,7 @@
     }
 }
 
-https://{$NC_DOMAIN}:443 {
+{$PROTOCOL}://{$NC_DOMAIN}:{$APACHE_PORT} {
 
     # Notify Push
     route /push/* {

Containers/apache/Dockerfile

@@ -59,7 +59,7 @@ COPY start.sh /usr/bin/
 COPY supervisord.conf /
 RUN chmod +x /usr/bin/start.sh; \
     chmod +r /supervisord.conf; \
-    chmod +r /Caddyfile;
+    chmod +w /Caddyfile;
 
 # Give root a random password
 RUN echo "root:$(openssl rand -base64 12)" | chpasswd

Containers/apache/start.sh

@@ -23,6 +23,19 @@ while ! nc -z "$COLLABORA_HOST" 9980; do
     sleep 5
 done
 
+if [ -z "$APACHE_PORT" ]; then
+    export APACHE_PORT="443"
+fi
+
+if [ "$APACHE_PORT" != '443' ]; then
+    export PROTOCOL="http"
+    export NC_DOMAIN=""
+    sed -i 's|auto_https.*|auto_https off|' /Caddyfile
+else
+    export PROTOCOL="https"
+    sed -i 's|auto_https.*|auto_https disable_redirects|' /Caddyfile
+fi
+
 # Add caddy path
 mkdir -p /mnt/data/caddy/
 

Containers/domaincheck/lighttpd.conf

@@ -1,6 +1,6 @@
 server.document-root = "/var/www/domaincheck/" 
 
-server.port = 443
+server.port = env.APACHE_PORT
 
 server.username = "www-data" 
 server.groupname = "www-data" 

Containers/domaincheck/start.sh

@@ -7,6 +7,10 @@ fi
 
 echo "$INSTANCE_ID" > /var/www/domaincheck/index.html
 
+if [ -z "$APACHE_PORT" ]; then
+    export APACHE_PORT="443"
+fi
+
 # Check config file
 lighttpd -tt -f /etc/lighttpd/lighttpd.conf
 

Containers/mastercontainer/start.sh

@@ -6,6 +6,14 @@ print_green() {
     printf "%b%s%b\n" "\e[0;92m" "$TEXT" "\e[0m"
 }
 
+# Function to check if number was provided
+check_if_number() {
+case "${1}" in
+    ''|*[!0-9]*) return 1 ;;
+    *) return 0 ;;
+esac
+}
+
 # Check if socket is available and readable
 if ! [ -a "/var/run/docker.sock" ]; then
     echo "Docker socket is not available. Cannot continue."
@@ -68,6 +76,15 @@ The string must be equal to/start with '/mnt/' or '/media/' or be equal to '/var
         exit 1
     fi
 fi
+if [ -n "$APACHE_PORT" ]; then
+    if ! check_if_number "$APACHE_PORT"; then
+        echo "You provided an Apache port but did not only use numbers"
+        exit 1
+    elif ! [ "$APACHE_PORT" -le 65535 ] || ! [ "$APACHE_PORT" -ge 1 ]; then
+        echo "The provided Apache port is invalid. It must be between 1 and 65535"
+        exit 1
+    fi
+fi
 
 # Add important folders
 mkdir -p /mnt/docker-aio-config/data/