Serve windmill on /windmill subpath instead of port 3100; add to disable-containers.js

Agent-Logs-Url: https://github.com/nextcloud/all-in-one/sessions/3c346202-c2e6-4e97-bf61-a1f5d42670fd

Co-authored-by: szaimen <42591237+szaimen@users.noreply.github.com>

Containers/apache/Caddyfile

@@ -63,6 +63,12 @@ http://{$APACHE_HOST}.nextcloud-aio:23973, # For Collabora callback and WOPI req
         reverse_proxy {$WHITEBOARD_HOST}:3002
     }
 
+    # Windmill
+    route /windmill/* {
+        uri strip_prefix /windmill
+        reverse_proxy {$WINDMILL_HOST}:8000
+    }
+
     # HaRP (ExApps)
     route /exapps/* {
         reverse_proxy {$HARP_HOST}:8780

Containers/apache/start.sh

@@ -60,14 +60,10 @@ if [ -z "$ADDITIONAL_TRUSTED_DOMAIN" ]; then
 fi
 echo "$CADDYFILE" > /tmp/Caddyfile
 
-# Add windmill site if windmill is enabled
-if [ "$WINDMILL_ENABLED" = "yes" ]; then
-    cat >> /tmp/Caddyfile << 'WINDMILL_EOF'
-
-https://{$NC_DOMAIN}:3100 {
-    reverse_proxy {$WINDMILL_HOST}:8000
-}
-WINDMILL_EOF
+# Remove windmill route if windmill is not enabled
+if [ "$WINDMILL_ENABLED" != "yes" ]; then
+    CADDYFILE="$(sed '/# Windmill/{N;N;N;N;d}' /tmp/Caddyfile)"
+    echo "$CADDYFILE" > /tmp/Caddyfile
 fi
 
 # Fix the Caddyfile format