From 9f6853048cb8e4ec79da4cc01991a738f9012004 Mon Sep 17 00:00:00 2001
From: Albrecht Lohofener <albrechtloh@gmx.de>
Date: Tue, 26 Mar 2024 20:26:25 +0100
Subject: [PATCH] Show container web interface layout also as u-OS app.

---
 src/init_container.sh   | 13 +++++++++++++
 web/index.html          |  2 +-
 web/nginx.conf.u-os-app | 11 +++++++----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/init_container.sh b/src/init_container.sh
index 4677bb9..8946e94 100644
--- a/src/init_container.sh
+++ b/src/init_container.sh
@@ -31,9 +31,22 @@ fi
 if [[ -z "${IS_U_OS_APP}" ]]; then
   info "Detected generic container"
   cp -f /var/www/nginx.conf.generic /etc/nginx/http.d/web.conf
+
+  # Activate script-server
+  sed -i 's/---SED_REPLACEMENT_TAG---/"script-server\/"/g' /var/www/index.html 
 else
   info "Detected u-OS app"
   cp -f  /var/www/nginx.conf.u-os-app /etc/nginx/http.d/web.conf
+
+  # Generate page for meta information
+  echo "* Content of /var/vm/openwrt_metadata.conf *" > /var/www/system_info.txt
+  cat /var/vm/openwrt_metadata.conf >> /var/www/system_info.txt
+  echo $'\n' >> /var/www/system_info.txt
+
+  echo "* Enviroment variables *" >> /var/www/system_info.txt
+  export >> /var/www/system_info.txt
+
+  sed -i 's/---SED_REPLACEMENT_TAG---/"system_info.txt"/g' /var/www/index.html 
 fi
 
 
diff --git a/web/index.html b/web/index.html
index 584fa2b..631525f 100644
--- a/web/index.html
+++ b/web/index.html
@@ -113,7 +113,7 @@
                 </span>
             </div>
             <div class="item2">
-                <iframe src="script-server/" width="95%"></iframe>
+                <iframe src=---SED_REPLACEMENT_TAG--- width="95%"></iframe>
             </div>
             <div class="item3">
                 <iframe src="novnc/" width="100%"></iframe>
diff --git a/web/nginx.conf.u-os-app b/web/nginx.conf.u-os-app
index 9b05abb..9d41013 100644
--- a/web/nginx.conf.u-os-app
+++ b/web/nginx.conf.u-os-app
@@ -26,14 +26,17 @@ server {
     add_header Cache-Control "no-cache";
 
     location / {
+      root /var/www;
+    }
 
-      root /usr/share/novnc;
+    location /novnc {
       index vnc.html;
+      alias /usr/share/novnc;
+      try_files $uri $uri/ /vnc.html;
 
-      if ($request_uri = "/") {
-        return 301 ?resize=scale&reconnect_delay=2000&autoconnect=true&path=u-os-app-openwrt/websockify;
+      if ($request_uri = "/novnc/") {
+        return 301 ?resize=scale&autoconnect=true&reconnect_delay=2000&reconnect=true&path=u-os-app-openwrt/websockify;
       }
-
     }
 
     location /websockify {