From 99cef7283ffcff6b959e6288d176f5600069804f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 23 Feb 2026 07:57:05 +0000
Subject: [PATCH 2/2] Fix webtop ingress: replace CWS port placeholder with
 8082 and SUBFOLDER with /

Co-authored-by: alexbelgium <44178713+alexbelgium@users.noreply.github.com>
---
 webtop/CHANGELOG.md                             | 3 +++
 webtop/config.yaml                              | 2 +-
 webtop_kde/CHANGELOG.md                         | 3 +++
 webtop_kde/config.yaml                          | 2 +-
 webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh | 5 ++---
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/webtop/CHANGELOG.md b/webtop/CHANGELOG.md
index a3e9c4e1d..a2749be94 100644
--- a/webtop/CHANGELOG.md
+++ b/webtop/CHANGELOG.md
@@ -1,5 +1,8 @@
 - Added support for configuring extra environment variables via the `env_vars` add-on option alongside config.yaml. See https://github.com/alexbelgium/hassio-addons/wiki/Add-Environment-variables-to-your-Addon-2 for details.
 
+## 4.16-r0-ls95-5 (2026-02-23)
+- Fix ingress: replace CWS port placeholder with 8082 and SUBFOLDER with /
+
 ## 4.16-r0-ls95-4 (2025-06-01)
 - Minor bugs fixed
 ## 4.16-r0-ls94-4 (2025-05-28)
diff --git a/webtop/config.yaml b/webtop/config.yaml
index 58f516855..dfe83b9ca 100644
--- a/webtop/config.yaml
+++ b/webtop/config.yaml
@@ -138,5 +138,5 @@ slug: webtop-kde
 tmpfs: true
 udev: true
 url: https://github.com/alexbelgium/hassio-addons
-version: 4.16-r0-ls95-4
+version: 4.16-r0-ls95-5
 video: true
diff --git a/webtop_kde/CHANGELOG.md b/webtop_kde/CHANGELOG.md
index 66cbabf5d..f2f05ffd8 100644
--- a/webtop_kde/CHANGELOG.md
+++ b/webtop_kde/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+## 4.16-r0-ls94-2 (2026-02-23)
+- Fix ingress: replace CWS port placeholder with 8082 and SUBFOLDER with /
+
 ## 4.16-r0-ls94 (2026-02-21)
 - Update to latest version from linuxserver/docker-webtop (changelog : https://github.com/linuxserver/docker-webtop/releases)
 
diff --git a/webtop_kde/config.yaml b/webtop_kde/config.yaml
index 1922c4941..f61d15947 100644
--- a/webtop_kde/config.yaml
+++ b/webtop_kde/config.yaml
@@ -143,5 +143,5 @@ slug: webtop
 tmpfs: true
 udev: true
 url: https://github.com/alexbelgium/hassio-addons
-version: "4.16-r0-ls94"
+version: "4.16-r0-ls94-2"
 video: true
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 789c69061..4a7466cf3 100755
--- a/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh
+++ b/webtop_kde/rootfs/etc/cont-init.d/90-ingress.sh
@@ -16,14 +16,13 @@ mv tmpfile "${NGINX_CONFIG}"
 sed -i '/listen \[::\]/d' "${NGINX_CONFIG}"
 # Add ingress parameters
 sed -i "s|3000|$(bashio::addon.ingress_port)|g" "${NGINX_CONFIG}"
+sed -i "s|CWS|8082|g" "${NGINX_CONFIG}"
+sed -i "s|SUBFOLDER|/|g" "${NGINX_CONFIG}"
 sed -i '/proxy_buffering/a proxy_set_header Accept-Encoding "";' "${NGINX_CONFIG}"
 sed -i '/proxy_buffering/a sub_filter_once off;' "${NGINX_CONFIG}"
 sed -i '/proxy_buffering/a sub_filter_types *;' "${NGINX_CONFIG}"
 sed -i '/proxy_buffering/a sub_filter "vnc/index.html?autoconnect" "vnc/index.html?path=%%path%%/websockify?autoconnect";' "${NGINX_CONFIG}"
 sed -i "s|%%path%%|${SUBFOLDER:1}|g" "${NGINX_CONFIG}"
 
-# Correct image
-sed -i "s|SUBFOLDERwebsockify|/websockify|g" "${NGINX_CONFIG}"
-
 # Enable ingress
 cp "${NGINX_CONFIG}" /etc/nginx/sites-enabled