Fix PR #3 review issues: idempotent VNC auth, noVNC/VNC dependency, DISPLAY interpolation, stale xterm refs

README.md

@@ -66,7 +66,6 @@ If you need an even smaller image:
 
 | Variable | Default | Description |
 |----------|---------|-------------|
-| `DISPLAY` | `:0` | X display number |
 | `RESOLUTION` | `1024x768` | Screen resolution |
 | `VNC_PASSWORD` | (none) | VNC password (optional) |
 | `ENABLE_VNC` | `true` | Enable VNC server |
@@ -196,4 +195,4 @@ docker build -t tiny-remote-desktop .
 
 ## License
 
-Open source - use freely for personal and educational purposes.
+This project does not yet include a formal license file. All rights are reserved by the maintainer unless otherwise stated. Please contact the maintainer for usage permissions.

entry.sh

@@ -1,8 +1,24 @@
 #!/bin/sh
 
-# Configure VNC password if provided
+# Configure VNC password if provided (idempotent using -rfbauth)
 if [ "$VNC_PASSWORD" ]; then
-    sed -i "s/^\(command.*x11vnc.*\)$/\1 -passwd '$VNC_PASSWORD'/" /etc/supervisord.conf
+    VNC_PASSFILE="/root/.vncpass"
+    x11vnc -storepasswd "$VNC_PASSWORD" "$VNC_PASSFILE"
+    chmod 600 "$VNC_PASSFILE"
+    # Make the change idempotent: remove any existing -passwd, -rfbauth, or -nopw args on the x11vnc command
+    sed -i \
+        -e '/command.*x11vnc/ s/ -passwd [^ ]*//g' \
+        -e '/command.*x11vnc/ s/ -rfbauth [^ ]*//g' \
+        -e '/command.*x11vnc/ s/ -nopw//g' \
+        /etc/supervisord.conf
+    # Append the auth file option to the x11vnc command
+    sed -i "s|^\(command.*x11vnc.*\)$|\1 -rfbauth ${VNC_PASSFILE}|" /etc/supervisord.conf
+fi
+
+# Ensure noVNC is not enabled when VNC is disabled
+if [ "$ENABLE_NOVNC" = "true" ] && [ "$ENABLE_VNC" != "true" ]; then
+    echo "Warning: ENABLE_NOVNC=true requires ENABLE_VNC=true; disabling noVNC."
+    ENABLE_NOVNC="false"
 fi
 
 # Disable services based on environment variables
@@ -26,4 +42,4 @@ if [ "$AUTOSTART_FIREFOX" = "true" ]; then
     chmod +x /root/.fluxbox/startup
 fi
 
-exec /usr/bin/supervisord
+exec /usr/bin/supervisord

menu

@@ -18,7 +18,7 @@
 [encoding] {UTF-8}
       [exec] (Firefox) {firefox}
 [submenu] (System Tools)
-      [exec]   (top) {xterm -e top}
+      [nop]    (top (no terminal available))
 [end]
 [submenu] (Fluxbox menu)
       [config] (Configure)

supervisord.conf

@@ -2,12 +2,12 @@
 nodaemon=true
 
 [program:X11]
-command=/usr/bin/Xvfb :0 -screen 0 %(ENV_RESOLUTION)sx24
+command=/usr/bin/Xvfb %(ENV_DISPLAY)s -screen 0 %(ENV_RESOLUTION)sx24
 autorestart=true
 priority=10
 
 [program:x11vnc]
-command=/usr/bin/x11vnc -xkb -noxrecord -noxfixes -noxdamage -display :0 -forever -nopw -wait 5 -shared -permitfiletransfer -tightfilexfer -rfbport 5901
+command=/usr/bin/x11vnc -xkb -noxrecord -noxfixes -noxdamage -display %(ENV_DISPLAY)s -forever -wait 5 -shared -permitfiletransfer -tightfilexfer -rfbport 5901
 autorestart=true
 priority=20
 
@@ -20,7 +20,7 @@ priority=30
 command=/usr/bin/fluxbox
 autorestart=true
 priority=40
-environment=DISPLAY=":0"
+environment=DISPLAY="%(ENV_DISPLAY)s"
 
 [program:xrdp]
 command=/usr/sbin/xrdp -n