From 4451148870db7ad10aa48f36d8c298396d448374 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 2 Sep 2023 17:30:52 +0200
Subject: [PATCH] Update 90-ingress.sh

---
 webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh
index db5ef2c86..b45c77b1c 100755
--- a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh
+++ b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh
@@ -9,15 +9,16 @@ CPORT="${CUSTOM_PORT:-3000}"
 CHPORT="${CUSTOM_HTTPS_PORT:-3001}"
 CUSER="${CUSTOM_USER:-abc}"
 
-# Add ingress parameters
+# Copy template
 cp /defaults/default.conf ${NGINX_CONFIG}
+# Remove ssl part
+awk -v n=4 '/server/{n--}; n > 0' ${NGINX_CONFIG}
+# Remove ipv6
 sed -i '/listen \[::\]/d' ${NGINX_CONFIG}
+# Add ingress parameters
+sed -i "s|3000|$(bashio::addon.ingress_port)|g" ${NGINX_CONFIG}
 sed -i '/server {/a include /etc/nginx/includes/server_params.conf;' ${NGINX_CONFIG}
 sed -i '/server {/a include /etc/nginx/includes/proxy_params.conf;' ${NGINX_CONFIG}
-sed -i "s|3000|$(bashio::addon.ingress_port)|g" ${NGINX_CONFIG}
-
-# Implement SUBFOLDER value
-#sed -i "1a SUBFOLDER=$(bashio::addon.ingress_url)" /etc/s6-overlay/s6-rc.d/svc-autostart/run || true
 
 # Enable ingress
 cp /etc/nginx/sites-available/ingress.conf /etc/nginx/sites-enabled