mirror of
https://github.com/OpenNebula/one.git
synced 2025-01-08 21:17:43 +03:00
parent
d6b89b6fe2
commit
18f9137de2
@ -399,6 +399,7 @@ helpers do
|
||||
response = ""
|
||||
if $conf && $conf[:private_fireedge_endpoint] && !$conf[:private_fireedge_endpoint].empty?
|
||||
begin
|
||||
$conf[:private_fireedge_endpoint] = $conf[:private_fireedge_endpoint].downcase
|
||||
uri = URI($conf[:private_fireedge_endpoint]+'/fireedge/api/auth')
|
||||
user_pass = Base64.decode64(session[:auth])
|
||||
username = user_pass.split(":")[0]
|
||||
|
@ -104,7 +104,7 @@
|
||||
'vnc_proxy_port' : '<%= $vnc.proxy_port %>',
|
||||
'vnc_client_port' : '<%= $conf[:vnc_client_port] %>',
|
||||
'max_upload_file_size' : <%= $conf[:max_upload_file_size] ? $conf[:max_upload_file_size] : "undefined" %>,
|
||||
'public_fireedge_endpoint': '<%= $conf[:public_fireedge_endpoint] %>'
|
||||
'public_fireedge_endpoint': '<%= $conf[:public_fireedge_endpoint].downcase %>'
|
||||
},
|
||||
'view' : view,
|
||||
'available_views' : available_views,
|
||||
|
@ -64,7 +64,7 @@
|
||||
'mapped_ips' : '<%= $conf[:mapped_ips] ? $conf[:mapped_ips] : false %>',
|
||||
'get_extended_vm_info': '<%= $conf[:get_extended_vm_info] ? $conf[:get_extended_vm_info] : false %>',
|
||||
'get_extended_vm_monitoring': '<%= $conf[:get_extended_vm_monitoring] ? $conf[:get_extended_vm_monitoring] : false %>',
|
||||
'public_fireedge_endpoint': '<%= $conf[:public_fireedge_endpoint] %>',
|
||||
'public_fireedge_endpoint': '<%= $conf[:public_fireedge_endpoint].downcase %>',
|
||||
},
|
||||
'view' : view,
|
||||
'available_views' : available_views,
|
||||
|
Loading…
Reference in New Issue
Block a user