Basic/Survey/Bulk laptops

handbook/computing/keyexchange.html

@@ -10,7 +10,7 @@
 
 <h1>Key-Pair Setup</h1>
 <p><var>You only need to do this if you need to do bulk updates of a lot of files to the server.</var> <br> - Copying files <em>from</em> the server does not need this.<br>
- - Only people updating or rearranging files on the server need this, e.g.
+ - Only people updating or rearranging files on the server with a <a href="bulkupdatelaptop.html">Bulk Update Laptop</a>, or programmers doing <a href="../troggle/troglaptop.html">troggle software development</a> need this, e.g.
   <ul>
     <li>Editing lots of survex files in the Loser repository
     <li>Moving photographs or Drawing files to the final archive locations
@@ -125,12 +125,13 @@ documentation</a>, start from scratch, and do it all again but this time using a
 
   <h3>Chromebook</h3>
 
-<li>See initial instructions in <a href="basiclaptop.html#chromebook">Chromebooks</a> then follow the instructions for Linux here.</li>
+<li>See initial instructions in <a href="chromebook.html">Chromebooks</a> then follow the instructions for Linux here.</li>
 
   <h3>Android</h3>
 	<ul>
   <li>Install the <a href="https://play.google.com/store/apps/details?id=com.server.auditor.ssh.client&hl=en">Termius app</a>
 	which is a ssh client. The free version does ssh but not sFTP. Follow the <a href="https://docs.termius.com/">Termius documentation</a> and in-app help to generate a key pair and then use the same process to upload the public key to the expo server as for Linux machines, i.e. email it to an admin.
+    <li>See the expo page on <a href="phone.html">phones</a>.
 	</li>
 	</ul>
   <h3>iOS</h3>
@@ -141,7 +142,7 @@ documentation</a>, start from scratch, and do it all again but this time using a
 
 
 
-<h2>Your second machine</h2>
+<h2 id="secondmachine">Your second machine</h2>
 <p>OK, you have an uploaded and usable key and you can ssh into the expo server. If you want to connect from another machine (e.g. your phone) it's better to make another key than try to re-use the first one. You don't need a nerd admin now, you can do this yourself. But be <b>extremely careful</b> to follow this exactly. If you innocently rename the files to something that appears more sensible it won't work.
 <ol>
 <li>On your new machine, generate a key-pair. Since you are probably using a different operating system on your second machine, read the instructions above for the relevant OS. Yes you will be generating a new key. Do not re-use the key you had already.
@@ -151,7 +152,22 @@ documentation</a>, start from scratch, and do it all again but this time using a
 <li>
 If you accepted the defaults, the public key will be called <var>~/.ssh/id_rsa.pub</var> - check that this is the case.
 <li>Now copy the public key file to your <em>first machine</em>, the one that is already set up with a working key-pair setup with the expo server. Using email to yourself is easiest.
-<li>Now upload the public key using sFTP (Filezilla configured to use sFTP, which uses Pageant by default) to 
+<li>Now upload the public key. There are 2 ways to do it:
+<ol>
+<li>Using ssh-copy-id
+<li>Using a complex collection of file transfers and file copying and appending
+</ol>
+</ul>
+<h4>Using ssh-copy-id</h4>
+<ul>
+<li>On the first machine which already has a key installed, download the second key from email and rename it as, e.g. <var>pulsifer_id_rsa.pub</var>
+<li>do this command:<br>
+<code>ssh-copy-id -i pulsifer_id_rsa.pub expo@expo.survex.com</code>
+<li>That's it.
+</ul>
+<h4>Using Filezilla and file copying</h4>
+<ul>
+<li>using sFTP (Filezilla configured to use sFTP, which uses Pageant by default) to 
 <var>expo.survex.com/home/expo/.ssh/keys/</var>
 <li>Now login to the expo server on your first machine and do these commands:<br />
 Be <b>extremely careful</b> to type ">>" and not ">" in the fourth line below otherwise you will delete <i>everyone's</i> logins.
@@ -162,13 +178,15 @@ Be <b>extremely careful</b> to type ">>" and not ">" in the fourth line below ot
 <br /><font color=blue">expo@expo:~/.ssh$</font> tail -n 1  authorized_keys
 </code> 
 This adds your key on to the end of the authorized keys list and prints the last line - which should be your key that you just added.
+<p>Note that by using sFTP like this we avoid having to use a text editor over ssh. If you know what you are doing you can do this of course, but the above process is less likely to cause problems for a Windows user setting up their phone as a second device where they are not experienced with vi or nano.
+</ul>
 <li>Now your public key is installed for your second machine. This will enable ssh login instantly. You check that it works by logging into the expo server using ssh from your second machine: <var>ssh expo@expo.survex.com </var>. 
 </p>
-<p>Note that by using sFTP like this we avoid having to use a text editor over ssh. If you know what you are doing you can do this of course, but the above process is less likely to cause problems for a Windows user setting up their phone as a second device where they are not experienced with vi or nano.
+
 
 
 
 </ol>
 <hr />
-Return to <a href="basiclaptop.html">Setting up a basic laptop</a></body>
+Return to <a href="bulkupdatelaptop.html">Setting up a bulk update laptop</a></body>
 </html>