Project

General

Profile

« Previous | Next » 

Revision 97c34475

Added by Lukas Zapletal almost 9 years ago

Fixes #9603 - fixed websockets_* set of settings

View differences:

app/controllers/hosts_controller.rb
def console
return unless @host.compute_resource
@console = @host.compute_resource.console @host.uuid
@encrypt = case Setting[:websockets_encrypt]
when 'on'
true
when 'off'
false
else
request.ssl? and not Setting[:websockets_ssl_key].blank? and not Setting[:websockets_ssl_cert].blank?
end
@encrypt = Setting[:websockets_encrypt]
render case @console[:type]
when 'spice'
"hosts/console/spice"

Also available in: Unified diff