From d4e0144cb1f086d65bce5f318ee01402fe8124f9 Mon Sep 17 00:00:00 2001
From: TC1977 <37350377+TC1977@users.noreply.github.com>
Date: Fri, 10 May 2019 12:17:48 -0400
Subject: [PATCH] Update SSH access instructions

---
 README.md | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index e3bc645f..357bf436 100644
--- a/README.md
+++ b/README.md
@@ -72,15 +72,15 @@ That's it! You will get the message below when the server deployment process com
 You can now setup clients to connect it, e.g. your iPhone or laptop. Proceed to [Configure the VPN Clients](#configure-the-vpn-clients) below.
 
 ```
-        "\"#----------------------------------------------------------------------#\"",
-        "\"#                          Congratulations!                            #\"",
-        "\"#                     Your Algo server is running.                     #\"",
-        "\"#    Config files and certificates are in the ./configs/ directory.    #\"",
-        "\"#              Go to https://whoer.net/ after connecting               #\"",
-        "\"#        and ensure that all your traffic passes through the VPN.      #\"",
-        "\"#                    Local DNS resolver 172.16.0.1                     #\"",
-        "\"#                The p12 and SSH keys password is XXXXXXXX             #\"",
-        "\"#----------------------------------------------------------------------#\"",
+    "#                          Congratulations!                            #"
+    "#                     Your Algo server is running.                     #"
+    "#    Config files and certificates are in the ./configs/ directory.    #"
+    "#              Go to https://whoer.net/ after connecting               #"
+    "#        and ensure that all your traffic passes through the VPN.      #"
+    "#                     Local DNS resolver 172.16.0.1                    #"
+    "#        The p12 and SSH keys password for new users is XXXXXXXX       #"
+    "#        The CA key password is XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX       #"
+    "#      Shell access: ssh -i configs/algo.pem root@xxx.xxx.xx.xx        #"
 ```
 
 ## Configure the VPN Clients
@@ -166,16 +166,14 @@ Use the example command below to start an SSH tunnel by replacing `user` and `ip
 
 ## SSH into Algo Server
 
-To SSH into the Algo server for administrative purposes you can use the example command below by replacing `ip` with your own:
+To SSH into the Algo server for administrative purposes you can log into Terminal, go to the algo directory, and then use the command listed on the success message:
 
- `ssh root@ip -i ~/.ssh/algo.pem`
+ `ssh -i configs/algo.pem user@ip`
 
-If you find yourself regularly logging into Algo then it will be useful to load your Algo ssh key automatically. Add the following snippet to the bottom of `~/.bash_profile` to add it to your shell environment permanently.
+where `user` is either `root` or `ubuntu` as listed on the success message, and `ip` is the IP address of your Algo server. If you find yourself regularly logging into the server then it will be useful to load your Algo ssh key automatically. Add the following snippet to the bottom of `~/.bash_profile` to add it to your shell environment permanently.
 
  `ssh-add ~/.ssh/algo > /dev/null 2>&1`
 
-Note the admin username is `ubuntu` instead of `root` on providers other than Digital Ocean.
-
 ## Adding or Removing Users
 
 If you chose to save the CA certificate during the deploy process, then Algo's own scripts can easily add and remove users from the VPN server.