Skip to content

Commit

Permalink
Small fix
Browse files Browse the repository at this point in the history
  • Loading branch information
phdelodder committed Jul 12, 2024
1 parent 19443ec commit b7732b9
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions docker/root/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ DECONZ_OPTS="--auto-connect=1 \
--ws-port=$DECONZ_WS_PORT"

if [ "$NON_ROOT" = 0 ]; then
GOSU="gosu"
GOSU="gosu deconz"
else
GOSU=""
fi
Expand Down Expand Up @@ -120,16 +120,16 @@ if [ "$DECONZ_VNC_MODE" != 0 ]; then
fi

# Cleanup previous VNC session data
$GOSU deconz tigervncserver -kill ':*'
$GOSU deconz tigervncserver -list ':*' -cleanstale
$GOSU tigervncserver -kill ':*'
$GOSU tigervncserver -list ':*' -cleanstale
for lock in "/tmp/.X${DECONZ_VNC_DISPLAY#:}-lock" "/tmp/.X11-unix/X${DECONZ_VNC_DISPLAY#:}"; do
[ -e "$lock" ] || continue
echo "[deconzcommunity/deconz] WARN - VNC-lock found. Deleting: $lock"
rm "$lock"
done

# Set VNC security
$GOSU deconz tigervncserver -SecurityTypes "$SECURITYTYPES" "$DECONZ_VNC_DISPLAY"
$GOSU tigervncserver -SecurityTypes "$SECURITYTYPES" "$DECONZ_VNC_DISPLAY"

# Export VNC display variable
export DISPLAY=$DECONZ_VNC_DISPLAY
Expand Down Expand Up @@ -158,7 +158,7 @@ if [ "$DECONZ_VNC_MODE" != 0 ]; then
chown deconz:deconz $NOVNC_CERT

#Start noVNC
$GOSU deconz websockify -D --web=/usr/share/novnc/ --cert="$NOVNC_CERT" $DECONZ_NOVNC_PORT localhost:$DECONZ_VNC_PORT
$GOSU websockify -D --web=/usr/share/novnc/ --cert="$NOVNC_CERT" $DECONZ_NOVNC_PORT localhost:$DECONZ_VNC_PORT
echo "[deconzcommunity/deconz] NOVNC port: $DECONZ_NOVNC_PORT"
fi

Expand All @@ -180,4 +180,4 @@ ln -sfT $DECONZ_APPDATA_DIR/otau /home/deconz/otau
chown deconz:deconz /home/deconz/otau
chown deconz:deconz $DECONZ_APPDATA_DIR -R

exec $GOSU deconz /usr/bin/deCONZ $DECONZ_OPTS
exec $GOSU /usr/bin/deCONZ $DECONZ_OPTS

0 comments on commit b7732b9

Please sign in to comment.