Merge pull request #1 from arvados/master

[arvados.git] / apps / workbench / app / views / users / _virtual_machines.html.erb

diff --git a/apps/workbench/app/views/users/_virtual_machines.html.erb b/apps/workbench/app/views/users/_virtual_machines.html.erb
index fc54178dcca9d56860f936121c9d76e3731d148c..e2ce5b39bc1c7e47373c6c8285d8abd8349428d7 100644 (file)
--- a/apps/workbench/app/views/users/_virtual_machines.html.erb
+++ b/apps/workbench/app/views/users/_virtual_machines.html.erb
@@ -1,3 +1,7 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
 <div class="panel panel-default">
   <div class="panel-heading">
     <h4 class="panel-title">
@@ -11,7 +15,7 @@
 <div id="manage_virtual_machines" class="panel-body">
   <p>
     For more information see <%= link_to raw('Arvados Docs &rarr; User Guide &rarr; VM access'),
-  "#{Rails.configuration.arvados_docsite}/user/getting_started/vm-login-with-webshell.html",
+  "#{Rails.configuration.Workbench.ArvadosDocsite}/user/getting_started/vm-login-with-webshell.html",
   target: "_blank"%>.
   </p>
 
@@ -64,7 +68,7 @@
           <th> Host name </th>
           <th> Login name </th>
           <th> Command line </th>
-          <% if Rails.configuration.shell_in_a_box_url %>
+          <% if Rails.configuration.Services.WebShell.ExternalURL != URI("") %>
             <th> Web shell <span class="label label-info">beta</span></th>
           <% end %>
         </tr>
@@ -81,11 +85,11 @@
             <td style="word-break:break-all;">
               <% if @my_vm_logins[vm[:uuid]] %>
                 <% @my_vm_logins[vm[:uuid]].each do |login| %>
-                  <code>ssh&nbsp;<%= login %>@<%= vm[:hostname] %>.arvados</code>
+                  <code>ssh&nbsp;<%= login %>@<%= vm[:hostname] %><%=Rails.configuration.Workbench.SSHHelpHostSuffix%></code>
                 <% end %>
               <% end %>
             </td>
-            <% if Rails.configuration.shell_in_a_box_url %>
+            <% if Rails.configuration.Services.WebShell.ExternalURL != URI("") %>
               <td>
                 <% @my_vm_logins[vm[:uuid]].andand.each do |login| %>
                   <%= link_to webshell_virtual_machine_path(vm, login: login), title: "Open a terminal session in your browser", class: 'btn btn-xs btn-default', target: "_blank" do %>
@@ -101,9 +105,7 @@
   <% end %>
 </div>
 </div>
-  <p>In order to access virtual machines using SSH, <%= link_to ssh_keys_user_path(current_user) do%> add an SSH key to your account<%end%> and add a section like this to your SSH configuration file ( <i>~/.ssh/config</i>):</p>
-    <pre>Host *.arvados
-      TCPKeepAlive yes
-      ServerAliveInterval 60
-      ProxyCommand ssh -p2222 turnout@switchyard.<%= current_api_host || 'xyzzy.arvadosapi.com' %> -x -a $SSH_PROXY_FLAGS %h
-    </pre>
+
+<p>In order to access virtual machines using SSH, <%= link_to ssh_keys_user_path(current_user) do%>add an SSH key to your account<%end%>.</p>
+
+<%= raw(Rails.configuration.Workbench.SSHHelpPageHTML) %>