projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18865-collection-permission-links'
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
virtual_machines_controller.rb
diff --git
a/apps/workbench/app/controllers/virtual_machines_controller.rb
b/apps/workbench/app/controllers/virtual_machines_controller.rb
index 1427e3cc728e3d30d5399223a3c4e311413a9d48..c743773141f672532396e7f73677f602548c41cc 100644
(file)
--- a/
apps/workbench/app/controllers/virtual_machines_controller.rb
+++ b/
apps/workbench/app/controllers/virtual_machines_controller.rb
@@
-25,8
+25,8
@@
class VirtualMachinesController < ApplicationController
end
def webshell
end
def webshell
- return render_not_found if Rails.configuration.
Workbench.ShellInABox
URL == URI("")
- webshell_url = URI(Rails.configuration.
Workbench.ShellInABox
URL)
+ return render_not_found if Rails.configuration.
Services.WebShell.External
URL == URI("")
+ webshell_url = URI(Rails.configuration.
Services.WebShell.External
URL)
if webshell_url.host.index("*") != nil
webshell_url.host = webshell_url.host.sub("*", @object.hostname)
else
if webshell_url.host.index("*") != nil
webshell_url.host = webshell_url.host.sub("*", @object.hostname)
else