From ac51eba855e989fd7494284524fce72ecf75eb69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Jir=C3=A1sek?= <pavel.jirasek@vsb.cz>
Date: Wed, 25 Jan 2017 12:39:39 +0100
Subject: [PATCH] Merget putty guides
---
.../shell-access-and-data-transfer/pageant.md | 12 ---
.../shell-access-and-data-transfer/putty.md | 75 ++++++++++++++++---
.../puttygen.md | 52 -------------
.../obtaining-login-credentials.md | 2 +-
mkdocs.yml | 2 -
5 files changed, 66 insertions(+), 77 deletions(-)
delete mode 100644 docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/pageant.md
delete mode 100644 docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/puttygen.md
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/pageant.md b/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/pageant.md
deleted file mode 100644
index e064dad2c..000000000
--- a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/pageant.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Pageant SSH agent
-=================
-
-Pageant holds your private key in memory without needing to retype a passphrase on every login.
-
-- Run Pageant.
-- On Pageant Key List press *Add key* and select your private key (id_rsa.ppk).
-- Enter your passphrase.
-- Now you have your private key in memory without needing to retype a passphrase on every login.
-
-
-
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md b/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md
index a6128d1da..512215786 100644
--- a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md
+++ b/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md
@@ -18,16 +18,6 @@ We recommned you to download "**A Windows installer for everything except PuTTYt
"Pageant" is optional.
-PuTTYgen
---------
-
-PuTTYgen is the PuTTY key generator. Read more how to load in an existing private key and change your passphrase or generate a new public/private key pair using [PuTTYgen](puttygen) if needed.
-
-Pageant SSH agent
------------------
-
-[Pageant](pageant) holds your private key in memory without needing to retype a passphrase on every login. We recommend its usage.
-
PuTTY - how to connect to the IT4Innovations cluster
----------------------------------------------------
@@ -60,3 +50,68 @@ Another PuTTY Settings
- Category -> Windows -> Translation -> Remote character set and select **UTF-8**.
- Category -> Terminal -> Features and select **Disable application keypad mode** (enable numpad)
- Save your configuration on Session page in to Default Settings with *Save* button.
+
+Pageant SSH agent
+-----------------
+
+Pageant holds your private key in memory without needing to retype a passphrase on every login.
+
+- Run Pageant.
+- On Pageant Key List press *Add key* and select your private key (id_rsa.ppk).
+- Enter your passphrase.
+- Now you have your private key in memory without needing to retype a passphrase on every login.
+
+
+
+PuTTY key generator
+-------------------
+
+PuTTYgen is the PuTTY key generator. You can load in an existing private key and change your passphrase or generate a new public/private key pair.
+
+### Change Password for Existing Private Key
+
+You can change the password of your SSH key with "PuTTY Key Generator". Make sure to backup the key.
+
+- Load your [private key](../shell-access-and-data-transfer/ssh-keys/) file with *Load* button.
+- Enter your current passphrase.
+- Change key passphrase.
+- Confirm key passphrase.
+- Save your private key with *Save private key* button.
+
+
+
+Generate a New Public/Private key
+---------------------------------
+
+You can generate an additional public/private key pair and insert public key into authorized_keys file for authentication with your own private key.
+
+- Start with *Generate* button.
+
+
+
+- Generate some randomness.
+
+
+
+- Wait.
+
+
+
+- Enter a *comment* for your key using format 'username@organization.example.com'.
+ Enter key passphrase.
+ Confirm key passphrase.
+ Save your new private key `in "*.ppk" `format with *Save private key* button.
+
+
+
+- Save the public key with *Save public key* button.
+ You can copy public key out of the â€Public key for pasting into authorized_keys file’ box.
+
+
+
+- Export private key in OpenSSH format "id_rsa" using Conversion -> Export OpenSSH key
+
+
+
+- Now you can insert additional public key into authorized_keys file for authentication with your own private key.
+ You must log in using ssh key received after registration. Then proceed to [How to add your own key](../shell-access-and-data-transfer/ssh-keys/).
diff --git a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/puttygen.md b/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/puttygen.md
deleted file mode 100644
index 74848055b..000000000
--- a/docs.it4i/get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/puttygen.md
+++ /dev/null
@@ -1,52 +0,0 @@
-PuTTY key generator
-===================
-
-PuTTYgen is the PuTTY key generator. You can load in an existing private key and change your passphrase or generate a new public/private key pair.
-
-### Change Password for Existing Private Key
-
-You can change the password of your SSH key with "PuTTY Key Generator". Make sure to backup the key.
-
-- Load your [private key](../shell-access-and-data-transfer/ssh-keys/) file with *Load* button.
-- Enter your current passphrase.
-- Change key passphrase.
-- Confirm key passphrase.
-- Save your private key with *Save private key* button.
-
-
-
-Generate a New Public/Private key
----------------------------------
-
-You can generate an additional public/private key pair and insert public key into authorized_keys file for authentication with your own private key.
-
-- Start with *Generate* button.
-
-
-
-- Generate some randomness.
-
-
-
-- Wait.
-
-
-
-- Enter a *comment* for your key using format 'username@organization.example.com'.
- Enter key passphrase.
- Confirm key passphrase.
- Save your new private key `in "*.ppk" `format with *Save private key* button.
-
-
-
-- Save the public key with *Save public key* button.
- You can copy public key out of the â€Public key for pasting into authorized_keys file’ box.
-
-
-
-- Export private key in OpenSSH format "id_rsa" using Conversion -> Export OpenSSH key
-
-
-
-- Now you can insert additional public key into authorized_keys file for authentication with your own private key.
- You must log in using ssh key received after registration. Then proceed to [How to add your own key](../shell-access-and-data-transfer/ssh-keys/).
diff --git a/docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials.md b/docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials.md
index a237e50d2..0f5f02bd1 100644
--- a/docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials.md
+++ b/docs.it4i/get-started-with-it4innovations/obtaining-login-credentials/obtaining-login-credentials.md
@@ -114,7 +114,7 @@ On Linux, use
local $ ssh-keygen -f id_rsa -p
```
-On Windows, use [PuTTY Key Generator](../accessing-the-clusters/shell-access-and-data-transfer/puttygen/).
+On Windows, use [PuTTY Key Generator](../accessing-the-clusters/shell-access-and-data-transfer/putty/#putty-key-generator).
Change Password
---------------
diff --git a/mkdocs.yml b/mkdocs.yml
index 759e52bbb..e621a2a11 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -24,8 +24,6 @@ pages:
# - VPN-Connection-Fail-in-Win-8.1: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/vpn-connection-fail-in-win-8.1.md
- SSH Keys: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/ssh-keys.md
- PuTTY: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/putty.md
- - PuTTY Pageant SSH Agent: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/pageant.md
- - PuTTY Key Generator: get-started-with-it4innovations/accessing-the-clusters/shell-access-and-data-transfer/puttygen.md
- X Window System: get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/x-window-system.md
- X Window System Using Cygwin: get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/cygwin-and-x11-forwarding.md
- VNC: get-started-with-it4innovations/accessing-the-clusters/graphical-user-interface/vnc.md
--
GitLab