diff --git a/utils/novnc_proxy b/utils/novnc_proxy index 0365c1e1..2afef24b 100755 --- a/utils/novnc_proxy +++ b/utils/novnc_proxy @@ -25,6 +25,8 @@ usage() { echo " Default: ./" echo " --ssl-only Disable non-https connections." echo " " + echo " --file-only Disable directory listing in web server." + echo " " echo " --record FILE Record traffic to FILE.session.js" echo " " echo " --syslog SERVER Can be local socket such as /dev/log, or a UDP host:port pair." @@ -60,7 +62,7 @@ TIMEOUT_ARG="" WEBAUTH_ARG="" AUTHPLUGIN_ARG="" AUTHSOURCE_ARG="" - +FILEONLY_ARG="" die() { @@ -90,6 +92,7 @@ while [ "$*" ]; do --key) KEY="${OPTARG}"; shift ;; --web) WEB="${OPTARG}"; shift ;; --ssl-only) SSLONLY="--ssl-only" ;; + --file-only) FILEONLY_ARG="--file-only" ;; --record) RECORD_ARG="--record ${OPTARG}"; shift ;; --syslog) SYSLOG_ARG="--syslog ${OPTARG}"; shift ;; --heartbeat) HEARTBEAT_ARG="--heartbeat ${OPTARG}"; shift ;; @@ -190,7 +193,7 @@ fi echo "Starting webserver and WebSockets proxy on port ${PORT}" #${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & -${WEBSOCKIFY} ${SYSLOG_ARG} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${KEY:+--key ${KEY}} ${PORT} ${VNC_DEST} ${HEARTBEAT_ARG} ${IDLETIMEOUT_ARG} ${RECORD_ARG} ${TIMEOUT_ARG} ${WEBAUTH_ARG} ${AUTHPLUGIN_ARG} ${AUTHSOURCE_ARG} & +${WEBSOCKIFY} ${SYSLOG_ARG} ${SSLONLY} ${FILEONLY_ARG} --web ${WEB} ${CERT:+--cert ${CERT}} ${KEY:+--key ${KEY}} ${PORT} ${VNC_DEST} ${HEARTBEAT_ARG} ${IDLETIMEOUT_ARG} ${RECORD_ARG} ${TIMEOUT_ARG} ${WEBAUTH_ARG} ${AUTHPLUGIN_ARG} ${AUTHSOURCE_ARG} & proxy_pid="$!" sleep 1 if ! ps -p ${proxy_pid} >/dev/null; then