check for nohttpd option before using it with vncserver (#767)

check for nohttpd option before using it with vncserver
OSC · Jul 21, 2022 · 4ae02fb · 4ae02fb
1 parent d82ad0a
commit 4ae02fb
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/ood_core/batch_connect/templates/vnc.rb b/lib/ood_core/batch_connect/templates/vnc.rb
@@ -86,8 +86,13 @@ def before_script
                 # Clean up any old VNC sessions that weren't cleaned before
                 #{vnc_clean}
 
+                # for turbovnc 3.0 compatability.
+                if timeout 2 vncserver --help 2>&1 | grep 'nohttpd' >/dev/null 2>&1; then
+                  HTTPD_OPT='-nohttpd'
+                fi
+
                 # Attempt to start VNC server
-                VNC_OUT=$(vncserver -log "#{vnc_log}" -rfbauth "#{vnc_passwd}" -nohttpd -noxstartup #{vnc_args} 2>&1)
+                VNC_OUT=$(vncserver -log "#{vnc_log}" -rfbauth "#{vnc_passwd}" $HTTPD_OPT -noxstartup #{vnc_args} 2>&1)
                 VNC_PID=$(pgrep -s 0 Xvnc) # the script above will daemonize the Xvnc process
                 echo "${VNC_OUT}"