[ARVADOS] updated: a24c2a7a7c8916664ea047c2e4f04bf2f0667082
git at public.curoverse.com
git at public.curoverse.com
Mon Jul 7 14:58:13 EDT 2014
Summary of changes:
apps/workbench/app/helpers/provenance_helper.rb | 54 ++++++++++++----------
.../collections/_show_chooser_preview.html.erb | 2 +-
.../app/views/collections/_show_files.html.erb | 2 +
.../ssh-access-windows.html.textile.liquid | 24 ++++------
.../getting_started/ssh-access.html.textile.liquid | 12 ++---
5 files changed, 48 insertions(+), 46 deletions(-)
via a24c2a7a7c8916664ea047c2e4f04bf2f0667082 (commit)
via a2dd2450b4f656affb90d197b9b892d17f15400f (commit)
via b356a7af84c41f8df246abd7eefafeeb8b49543f (commit)
via 58c4c9004cb4d3cf237831ffe32e64d530c320d7 (commit)
via 612cac77f91bf09ce648b9ad388fd643b2f13ef4 (commit)
via b654f5db50078accc595a169aad5e4548446c19f (commit)
via 4232d876ce3c2a0fec1760a7f023ca200ce129e5 (commit)
from a1fc48d0bdba5062da9d8ea57e2cda805421aab8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit a24c2a7a7c8916664ea047c2e4f04bf2f0667082
Merge: a2dd245 58c4c90
Author: radhika <radhika at curoverse.com>
Date: Mon Jul 7 14:51:29 2014 -0400
Merge branch 'master' into 2380-ssh-doc
commit a2dd2450b4f656affb90d197b9b892d17f15400f
Author: radhika <radhika at curoverse.com>
Date: Mon Jul 7 14:51:00 2014 -0400
2380: more doc updates
diff --git a/doc/user/getting_started/ssh-access-windows.html.textile.liquid b/doc/user/getting_started/ssh-access-windows.html.textile.liquid
index 2f82e76..2ca83f1 100644
--- a/doc/user/getting_started/ssh-access-windows.html.textile.liquid
+++ b/doc/user/getting_started/ssh-access-windows.html.textile.liquid
@@ -58,7 +58,7 @@ h1(#workbench). Adding your key to Arvados Workbench
h3. From the Workbench dashboard
-If you have no SSH keys registered, there should be a notification asking you to provide your SSH public key. On the Workbench dashboard, look for the envelope icon <span class="glyphicon glyphicon-envelope"></span> <span class="badge badge-alert">1</span> in upper right corner (the number indicates there are new notifications). Click on this icon and a dropdown menu should appear with a message asking you to add your public key. Paste your public key into the text area provided and click on the check button to submit the key. You are now ready to "log into an Arvados VM":#login.
+If you have no SSH keys registered, there should be a notification asking you to provide your SSH public key. In the Workbench top navigation menu, look for a dropdown menu with your email address in upper right corner. It will have an icon such as <span class="badge badge-alert">1</span> (the number indicates there are new notifications). Click on this icon and a dropdown menu should appear with a message asking you to add your public key. Paste your public key into the text area provided and click on the check button to submit the key. You are now ready to "log into an Arvados VM":#login.
h3. Alternate way to add SSH keys
diff --git a/doc/user/getting_started/ssh-access.html.textile.liquid b/doc/user/getting_started/ssh-access.html.textile.liquid
index 7773489..391e7fc 100644
--- a/doc/user/getting_started/ssh-access.html.textile.liquid
+++ b/doc/user/getting_started/ssh-access.html.textile.liquid
@@ -83,7 +83,7 @@ h1(#workbench). Adding your key to Arvados Workbench
h3. From the Workbench dashboard
-If you have no SSH keys registered, there should be a notification asking you to provide your SSH public key. On the Workbench dashboard, look for the envelope icon <span class="glyphicon glyphicon-envelope"></span> <span class="badge badge-alert">1</span> in upper right corner (the number indicates there are new notifications). Click on this icon and a dropdown menu should appear with a message asking you to add your public key. Paste your public key into the text area provided and click on the check button to submit the key. You are now ready to "log into an Arvados VM":#login.
+If you have no SSH keys registered, there should be a notification asking you to provide your SSH public key. In the Workbench top navigation menu, look for a dropdown menu with your email address in upper right corner. It will have an icon such as <span class="badge badge-alert">1</span> (the number indicates there are new notifications). Click on this icon and a dropdown menu should appear with a message asking you to add your public key. Paste your public key into the text area provided and click on the check button to submit the key. You are now ready to "log into an Arvados VM":#login.
h3. Alternate way to add SSH keys
commit b356a7af84c41f8df246abd7eefafeeb8b49543f
Author: radhika <radhika at curoverse.com>
Date: Mon Jul 7 14:36:25 2014 -0400
2380: minor doc updates
diff --git a/doc/user/getting_started/ssh-access-windows.html.textile.liquid b/doc/user/getting_started/ssh-access-windows.html.textile.liquid
index d8a0cec..2f82e76 100644
--- a/doc/user/getting_started/ssh-access-windows.html.textile.liquid
+++ b/doc/user/getting_started/ssh-access-windows.html.textile.liquid
@@ -24,7 +24,7 @@ If you downloaded the zip file, extract it to the location you wish to install t
h3. Step 1 - Adding PuTTY to the PATH
-# After downloading PuTTY and installing it, you should have a PuTTY folder in @C:\Program Files\@ or @C:\Program Files (x86)\@ (if you are using a 64 bit operating system).
+# After downloading PuTTY and installing it, you should have a PuTTY folder in @C:\Program Files\@ or @C:\Program Files (x86)\@ (if you are using a 64 bit operating system).
# Open the Control Panel.
# Select _Advanced System Settings_, and choose _Environment Variables_.
If you are using newer systems like Windows 7, you may use the following to open _Advanced System Settings_. Open Control Panel. Click on _System and Security_. Click on _System_. Click on _Advanced system settings_ and choose _Environment Variables..._
@@ -40,8 +40,8 @@ h3. Step 2 - Creating a Public Key
# Start PuTTYgen from the Start Menu or the folder where it was installed.
# At the bottom of the window, make sure the ‘Number of bits in a generated key’ field is set to 4096.
# Click Generate and follow the instructions to generate a key.
-# Click to save the Public Key.
-# Click to save the Private Key (we recommend using a strong passphrase).
+# Click the _Save public key_ button.
+# Click the _Save private key_ button (we recommend using a strong passphrase).
# Select the text of the Public Key and copy it to the clipboard.
h3. Step 3 - Set up Pageant
@@ -81,10 +81,10 @@ h3. Initial configuration
# Open PuTTY from the Start Menu.
# On the Session screen set the Host Name (or IP address) to “shell”, which is the hostname listed in the _Virtual Machines_ page.
# On the Session screen set the Port to “22”.
-# On the Connection %(rarr)→% Data screen set the Auto-login username to the username listed in the *logins* column on the Arvados Workbench page _Settings %(rarr)→% Virtual machines_ page.
+# On the Connection %(rarr)→% Data screen set the Auto-login username to the username listed in the *logins* column on the Arvados Workbench _Settings %(rarr)→% Virtual machines_ page.
# On the Connection %(rarr)→% Proxy screen set the Proxy Type to “Local”.
# On the Connection %(rarr)→% Proxy screen in the “Telnet command, or local proxy command” box enter:
-<code>plink -P 2222 turnout at switchyard.qr1hi.arvadosapi.com %host</code>
+<code>plink -P 2222 turnout at switchyard.{{ site.arvados_api_host }} %host</code>
Make sure there is no newline at the end of the text entry.
# Return to the Session screen. In the Saved Sessions box, enter a name for this configuration and click Save.
@@ -97,6 +97,6 @@ h3. Connecting to the VM
# Click Load to load those saved session settings.
# Click Open to open the SSH window at the command prompt. You will now be logged into your virtual machine.
-_Note_: If you see a hung terminal window with no futher action: open a new terminal window and type <code>plink -P 2222 turnout at switchyard.qr1hi.arvadosapi.com shell</code> in it. Hit enter and type _y_ when prompted to cache the session state. Go back and start PuTTY session using the start menu button.
+_Note_: If you see a hung terminal window with no further action: open a new terminal window by using the Start menu and type <code>plink -P 2222 turnout at switchyard.{{ site.arvados_api_host }} shell</code> in it. Please make sure to replace *shell* with the hostname listed in the _Virtual Machines_ page. Hit enter and type _y_ when prompted to cache the session state. Go back and start PuTTY session using the start menu button.
You should now be able to log into the Arvados VM and "check your environment.":check-environment.html
commit 612cac77f91bf09ce648b9ad388fd643b2f13ef4
Author: radhika <radhika at curoverse.com>
Date: Mon Jul 7 14:13:25 2014 -0400
2380: minor doc updates
diff --git a/doc/user/getting_started/ssh-access-windows.html.textile.liquid b/doc/user/getting_started/ssh-access-windows.html.textile.liquid
index 3a0fc09..d8a0cec 100644
--- a/doc/user/getting_started/ssh-access-windows.html.textile.liquid
+++ b/doc/user/getting_started/ssh-access-windows.html.textile.liquid
@@ -1,10 +1,10 @@
---
layout: default
navsection: userguide
-title: Accessing Arvados VM with SSH - Windows Environments
+title: Accessing an Arvados VM with SSH - Windows Environments
...
-This document is for windows environments. If you are using a unix environment (Linux, OS X, Cygwin), please visit the "Accessing Arvados VM with SSH - Unix Environments":ssh-access-unix.html
+This document is for windows environments. If you are using a unix environment (Linux, OS X, Cygwin), please visit the "Accessing Arvados VM with SSH - Unix Environments":ssh-access-unix.html page.
Arvados requires a public SSH key in order to securely log in to an Arvados VM instance, or to access an Arvados Git repository. The three sections below help you get started:
@@ -14,11 +14,9 @@ Arvados requires a public SSH key in order to securely log in to an Arvados VM i
h1(#gettingkey). Getting your SSH key
-h2(#windows). Using PuTTY
-
(Note: if you are using the SSH client that comes with "Cygwin":http://cygwin.com you should follow the "Unix":ssh-access-unix.html).
-"PuTTY":http://www.chiark.greenend.org.uk/~sgtatham/putty/ is a free (MIT-licensed) Win32 Telnet and SSH client. PuTTY includes all the tools a Windows user needs to create private keys and make SSH connections to your virtual machines in the Arvados Cloud.
+We will be using PuTTY to connect to Arvados. "PuTTY":http://www.chiark.greenend.org.uk/~sgtatham/putty/ is a free (MIT-licensed) Win32 Telnet and SSH client. PuTTY includes all the tools a Windows user needs to create private keys and make SSH connections to your virtual machines in the Arvados Cloud.
You can "download PuTTY from its Web site":http://www.chiark.greenend.org.uk/~sgtatham/putty/. Note that you should download the installer or .zip file with all of the PuTTY tools (PuTTYtel is not required).
@@ -78,8 +76,6 @@ h1(#login). Using SSH to log into an Arvados VM
To see a list of virtual machines that you have access to and determine the name and login information, click on *Settings* menu in the top navigation bar and click on *Virtual machines*. Once on the *Virtual machines* page, The *hostname* columns lists the name of each available VM. The *logins* column will have a value in the form of @["you"]@. Your login name is the text inside the quotes. In this guide the hostname will be *_shell_* and the login will be *_you_*. Replace these with your hostname and login name as appropriate.
-h2(#windowsvm). Logging in using PuTTY
-
h3. Initial configuration
# Open PuTTY from the Start Menu.
diff --git a/doc/user/getting_started/ssh-access.html.textile.liquid b/doc/user/getting_started/ssh-access.html.textile.liquid
index ecba88a..7773489 100644
--- a/doc/user/getting_started/ssh-access.html.textile.liquid
+++ b/doc/user/getting_started/ssh-access.html.textile.liquid
@@ -1,10 +1,10 @@
---
layout: default
navsection: userguide
-title: Accessing Arvados VM with SSH - Unix Environments
+title: Accessing an Arvados VM with SSH - Unix Environments
...
-This document is for unix environments (Linux, OS X, Cygwin). If you are using a windows environment, please visit the "Accessing Arvados VM with SSH - Windows Environments":ssh-access-windows.html
+This document is for unix environments (Linux, OS X, Cygwin). If you are using a windows environment, please visit the "Accessing Arvados VM with SSH - Windows Environments":ssh-access-windows.html page.
Arvados requires a public SSH key in order to securely log in to an Arvados VM instance, or to access an Arvados Git repository. The three sections below help you get started:
@@ -14,7 +14,7 @@ Arvados requires a public SSH key in order to securely log in to an Arvados VM i
h1(#gettingkey). Getting your SSH key
-h2(#unix). Using ssh-keygen
+h3(#unix). Generate key using ssh-keygen
Start by opening a terminal window. Check if you have an existing public key:
@@ -48,7 +48,7 @@ ssh-rsa AAAAB3NzaC1ycEDoNotUseExampleKeyDoNotUseExampleKeyDoNotUseExampleKeyDoNo
Now you can set up @ssh-agent@ (next) or proceed with "adding your key to the Arvados Workbench.":#workbench
-h3. Setting up ssh-agent (recommended)
+h3. Set up ssh-agent (recommended)
If you find you are entering your passphrase frequently, you can use @ssh-agent@ to manage your credentials. Use @ssh-add -l@ to test if you already have ssh-agent running:
@@ -101,8 +101,6 @@ h1(#login). Using SSH to log into an Arvados VM
To see a list of virtual machines that you have access to and determine the name and login information, click on Compute %(rarr)→% Virtual machines. Once on the *Virtual machines* page, The *hostname* columns lists the name of each available VM. The *logins* column will have a value in the form of @["you"]@. Your login name is the text inside the quotes. In this guide the hostname will be _shell_ and the login will be _you_. Replace these with your hostname and login name as appropriate.
-h2(#unixvm). Logging in using the @SSH@ command
-
h3. Connecting to the virtual machine
Use the following command to connect to the _shell_ VM instance as _you_. Replace *<code>you at shell</code>* at the end of the following command with your *login* and *hostname* from Workbench:
commit 4232d876ce3c2a0fec1760a7f023ca200ce129e5
Author: radhika <radhika at curoverse.com>
Date: Mon Jul 7 13:59:34 2014 -0400
2380: ssh to SSH where applicable
diff --git a/doc/user/getting_started/ssh-access-windows.html.textile.liquid b/doc/user/getting_started/ssh-access-windows.html.textile.liquid
index 313408f..3a0fc09 100644
--- a/doc/user/getting_started/ssh-access-windows.html.textile.liquid
+++ b/doc/user/getting_started/ssh-access-windows.html.textile.liquid
@@ -60,7 +60,7 @@ h1(#workbench). Adding your key to Arvados Workbench
h3. From the Workbench dashboard
-If you have no SSH keys registered, there should be a notification asking you to provide your ssh public key. On the Workbench dashboard, look for the envelope icon <span class="glyphicon glyphicon-envelope"></span> <span class="badge badge-alert">1</span> in upper right corner (the number indicates there are new notifications). Click on this icon and a dropdown menu should appear with a message asking you to add your public key. Paste your public key into the text area provided and click on the check button to submit the key. You are now ready to "log into an Arvados VM":#login.
+If you have no SSH keys registered, there should be a notification asking you to provide your SSH public key. On the Workbench dashboard, look for the envelope icon <span class="glyphicon glyphicon-envelope"></span> <span class="badge badge-alert">1</span> in upper right corner (the number indicates there are new notifications). Click on this icon and a dropdown menu should appear with a message asking you to add your public key. Paste your public key into the text area provided and click on the check button to submit the key. You are now ready to "log into an Arvados VM":#login.
h3. Alternate way to add SSH keys
diff --git a/doc/user/getting_started/ssh-access.html.textile.liquid b/doc/user/getting_started/ssh-access.html.textile.liquid
index aa697b8..ecba88a 100644
--- a/doc/user/getting_started/ssh-access.html.textile.liquid
+++ b/doc/user/getting_started/ssh-access.html.textile.liquid
@@ -83,7 +83,7 @@ h1(#workbench). Adding your key to Arvados Workbench
h3. From the Workbench dashboard
-If you have no SSH keys registered, there should be a notification asking you to provide your ssh public key. On the Workbench dashboard, look for the envelope icon <span class="glyphicon glyphicon-envelope"></span> <span class="badge badge-alert">1</span> in upper right corner (the number indicates there are new notifications). Click on this icon and a dropdown menu should appear with a message asking you to add your public key. Paste your public key into the text area provided and click on the check button to submit the key. You are now ready to "log into an Arvados VM":#login.
+If you have no SSH keys registered, there should be a notification asking you to provide your SSH public key. On the Workbench dashboard, look for the envelope icon <span class="glyphicon glyphicon-envelope"></span> <span class="badge badge-alert">1</span> in upper right corner (the number indicates there are new notifications). Click on this icon and a dropdown menu should appear with a message asking you to add your public key. Paste your public key into the text area provided and click on the check button to submit the key. You are now ready to "log into an Arvados VM":#login.
h3. Alternate way to add SSH keys
@@ -101,7 +101,7 @@ h1(#login). Using SSH to log into an Arvados VM
To see a list of virtual machines that you have access to and determine the name and login information, click on Compute %(rarr)→% Virtual machines. Once on the *Virtual machines* page, The *hostname* columns lists the name of each available VM. The *logins* column will have a value in the form of @["you"]@. Your login name is the text inside the quotes. In this guide the hostname will be _shell_ and the login will be _you_. Replace these with your hostname and login name as appropriate.
-h2(#unixvm). Logging in using the @ssh@ command
+h2(#unixvm). Logging in using the @SSH@ command
h3. Connecting to the virtual machine
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list