From e4dcdbfc2a7ba75ec04a2836e30278db3aba8a11 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Wed, 14 Feb 2024 11:19:42 -0800
Subject: [PATCH] change subfolder behavior to push the websockify path to the
 subfolder

---
 root/defaults/default.conf                 | 4 ++--
 root/etc/s6-overlay/s6-rc.d/init-nginx/run | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/root/defaults/default.conf b/root/defaults/default.conf
index 2dfebc4..1350d5f 100644
--- a/root/defaults/default.conf
+++ b/root/defaults/default.conf
@@ -25,7 +25,7 @@ server {
     proxy_buffering          off;
   }
 
-  location /websockify {
+  location SUBFOLDERwebsockify {
     proxy_http_version      1.1;
     proxy_set_header        Host $host;
     proxy_set_header        Upgrade $http_upgrade;
@@ -77,7 +77,7 @@ server {
     proxy_buffering          off;
   }
 
-  location /websockify {
+  location SUBFOLDERwebsockify {
     proxy_http_version      1.1;
     proxy_set_header        Host $host;
     proxy_set_header        Upgrade $http_upgrade;
diff --git a/root/etc/s6-overlay/s6-rc.d/init-nginx/run b/root/etc/s6-overlay/s6-rc.d/init-nginx/run
index 8382e6c..329ab80 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-nginx/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-nginx/run
@@ -7,6 +7,7 @@ NGINX_CONFIG=/etc/nginx/conf.d/default.conf
 CPORT="${CUSTOM_PORT:-3000}"
 CHPORT="${CUSTOM_HTTPS_PORT:-3001}"
 CUSER="${CUSTOM_USER:-abc}"
+SFOLDER="${SUBFOLDER:-/}"
 
 # create self signed cert
 if [ ! -f "/config/ssl/cert.pem" ]; then
@@ -24,6 +25,7 @@ fi
 cp /defaults/default.conf ${NGINX_CONFIG}
 sed -i "s/3000/$CPORT/g" ${NGINX_CONFIG}
 sed -i "s/3001/$CHPORT/g" ${NGINX_CONFIG}
+sed -i "s|SUBFOLDER|$SFOLDER|g" ${NGINX_CONFIG}
 if [ ! -z ${DISABLE_IPV6+x} ]; then
   sed -i '/listen \[::\]/d' ${NGINX_CONFIG}
 fi