diff --git a/entrypoint.sh b/entrypoint.sh index 4c70052..1625315 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -10,12 +10,10 @@ if [ -n "$VNC_PASSWORD" ]; then mkdir -p /root/.vnc echo "$VNC_PASSWORD" | vncpasswd -f > /root/.vnc/passwd chmod 0600 /root/.vnc/passwd + export VNC_SEC= +else + export VNC_SEC="-securitytypes TLSNone,X509None,None" fi -# vncserver "$DISPLAY" -securitytypes TLSNone,X509None,None -depth 24 -geometry "$VNC_RESOLUTION" -# websockify -D --web=/usr/share/novnc/ "$NOVNC_PORT" localhost:$((5900 + DISPLAY_NUMBER)) -# echo "NoVNC server started on port $NOVNC_PORT" -# EXEC=$@ -# exec "$@" export LOCALFBPORT=$((5900 + DISPLAY_NUMBER)) export VGLRUN=vglrun chown -R slic3r:slic3r /home/slic3r/ /configs/ /prints/ /dev/stdout && exec gosu slic3r supervisord # -e TRACE diff --git a/supervisord.conf b/supervisord.conf index 1695d56..1193783 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -4,7 +4,7 @@ pidfile=/tmp/supervisord.pid [program:vnc] priority=0 -command=/opt/TurboVNC/bin/vncserver %(ENV_DISPLAY)s -fg -securitytypes TLSNone,X509None,None -depth 24 -geometry %(ENV_VNC_RESOLUTION)s +command=/opt/TurboVNC/bin/vncserver %(ENV_DISPLAY)s -fg %(ENV_VNC_SEC)s -depth 24 -geometry %(ENV_VNC_RESOLUTION)s autorestart=true redirect_stderr=true