From 9d7a1e6af58adaca0e0eaff79c163f3a8930dd19 Mon Sep 17 00:00:00 2001
From: caubet_m <marc.caubet@psi.ch>
Date: Fri, 6 May 2022 13:12:20 +0200
Subject: [PATCH] Add ssh config options

---
 pages/merlin6/02-How-To-Use-Merlin/ssh-keys.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pages/merlin6/02-How-To-Use-Merlin/ssh-keys.md b/pages/merlin6/02-How-To-Use-Merlin/ssh-keys.md
index 80243b5..ddef5d6 100644
--- a/pages/merlin6/02-How-To-Use-Merlin/ssh-keys.md
+++ b/pages/merlin6/02-How-To-Use-Merlin/ssh-keys.md
@@ -39,6 +39,19 @@ For creating **SSH RSA Keys**, one should:
    ```bash
    echo "CanonicalizeHostname yes" >> ~/.ssh/config
    ```
+4. Configure further SSH options as follows:
+   ```bash
+   echo "AddKeysToAgent yes" >> ~/.ssh/config
+   echo "ForwardAgent yes" >> ~/.ssh/config
+   ```
+   Other options may be added.
+5. Check that your SSH config file contains at least the lines mentioned in steps 3 and 4:
+   ```bash
+   (base) ❄ [caubet_m@merlin-l-001:/data/user/caubet_m]# cat ~/.ssh/config
+   CanonicalizeHostname yes
+   AddKeysToAgent yes
+   ForwardAgent yes
+   ```
 
 ## Using the SSH Keys