mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2025-12-08 23:04:35 +00:00
Chnaging "key exchnage" to "key-pair setup" as it sounds less intimidating
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
<h1>Using expo server via FTP or scp or sftp connection</h1>
|
||||
|
||||
<h2>Configure connection on Android phone</h2>
|
||||
<p>SFTP only works if you have <a href="keyexchange.html">key exchange</a> set up. But
|
||||
<p>SFTP only works if you have <a href="keyexchange.html">key-pair setup</a> set up. But
|
||||
you can use FTP using this app and this method.
|
||||
|
||||
<ul>
|
||||
@@ -42,7 +42,7 @@ you can use FTP using this app and this method.
|
||||
</ul>
|
||||
<hr>
|
||||
<h2>Configure connection on Windows</h2>
|
||||
<p>scp only works if you have <a href="keyexchange.html">key exchange</a> set up.
|
||||
<p>scp only works if you have <a href="keyexchange.html">key-pair setup</a> set up.
|
||||
|
||||
<ul>
|
||||
<li>Get <a href="https://winscp.net/eng/download.php">WinScp</a> application to handle uploads or similar:<br>
|
||||
@@ -59,7 +59,7 @@ you can use FTP using this app and this method.
|
||||
|
||||
|
||||
<h2>Configure connection on Linux/Unix</h2>
|
||||
<p>scp only works if you have <a href="keyexchange.html">key exchange</a> set up.
|
||||
<p>scp only works if you have <a href="keyexchange.html">key-pair setup</a> set up.
|
||||
<ul>
|
||||
<li>You can upload files using 'scp' command (to upload localfile.file to expofiles/uploads/remotename.file)<br>
|
||||
<pre>
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
(if your name is Anathema Device and your new machine is "crowley"). Just click through the questions it asks accepting the defaults. It will tell you what the key files are called and where it has put them.
|
||||
<li>
|
||||
If you accepted the defaults, the public key will be called <span style="font-family:monospace; size=x-small; background-color: lightgray">id_rsa.pub</span> and it will be in <span style="font-family:monospace; size=x-small; background-color: lightgray">~/.ssh/</span> - 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 exchange with the expo server. Using email to yourself is easiest.
|
||||
<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 <span style="font-family:monospace; size=x-small; background-color: lightgray">expo.survex.com/home/expo/.ssh/keys/</span>
|
||||
<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 everything.
|
||||
|
||||
@@ -43,7 +43,7 @@ have <a href="keyexchange.html">key-pair setup</a> already set up before any of
|
||||
</dl>
|
||||
<h3><a id="Mercurialinwindows">Using Mercurial/TortoiseHg in Windows</a></h3>
|
||||
|
||||
<p>Read the instructions for setting up TortoiseHG in <a href="../tortoise/tortoise-win.htm">Tortoise-on-Windows</a>. But this won't work at all until you set up the key exchange using PuTty/Pageant.
|
||||
<p>Read the instructions for setting up TortoiseHG in <a href="../tortoise/tortoise-win.htm">Tortoise-on-Windows</a>. But this won't work at all until you set up the key-pair setup using PuTty/Pageant.
|
||||
<p>In Windows: install Mercurial and TortoiseHg of the relevant flavour from <a href="https://tortoisehg.bitbucket.io/">https://tortoisehg.bitbucket.io/</a> (ignoring antivirus/Windows warnings). This will install a submenu in your Programs menu)</p>
|
||||
|
||||
<p>To start cloning a repository: first create the folders you need for the repositories you are going to use, e.g. D:\CUCC-Expo\loser and D:\CUCC-Expo\expoweb. Then start TortoiseHg Workbench from your Programs menu, click File -> Clone repository, a dialogue box will appear. In the Source box type</p>
|
||||
|
||||
@@ -75,7 +75,7 @@ but all the recommended software here is open source (and please don't install p
|
||||
|
||||
<p>For Windows users only:
|
||||
<ul>
|
||||
<li>Read our instructions for setting up TortoiseHg in <a href="../tortoise/tortoise-win.htm">Tortoise-on-Windows</a>. (But this won't work at all until you set up the key exchange using PuTty/Pageant.)
|
||||
<li>Read our instructions for setting up TortoiseHg in <a href="../tortoise/tortoise-win.htm">Tortoise-on-Windows</a>. (But this won't work at all until you set up the key-pair setup using PuTty/Pageant.)
|
||||
<li><a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html">PuTTY</a> including pagent. Version 0.73 was released on 2019-09-29. You need this to generate and to use ssh keys on Windows. Otherwise none of git, mercurial, scp, ftp or rsync will work. It includes command line tools ssh, scp (pscp) and sFTP (psftp).
|
||||
<li><a href="https://gitforwindows.org/">Git for Windows</a>
|
||||
<li><a href="https://tortoisegit.org/support/faq/#prerequisites">TortoiseGit</a> - GUI interface to git
|
||||
@@ -122,7 +122,7 @@ to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-
|
||||
</ul>
|
||||
<p>When using Windows please, please be <a href="http://expo.survex.com/handbook/survey/getin.htm#filenames">excessively careful when naming files and survex names</a> and be <a href="../manual.html#quickstart">exceptionally careful when using rsync</a>.
|
||||
|
||||
<p>The handbook has documents where it is necessary to use scp or sftp to manage large files in 'expofiles'. See <a href="../upload-expert.html">Experts: Uploading files</a>, <a href="../uploading.html">Uploading files</a> and <a href="../gpxupload.html">Uploading GPS tracks</a>. Only machines which have done the key exchange process can do scp, sftp or rsync.
|
||||
<p>The handbook has documents where it is necessary to use scp or sftp to manage large files in 'expofiles'. See <a href="../upload-expert.html">Experts: Uploading files</a>, <a href="../uploading.html">Uploading files</a> and <a href="../gpxupload.html">Uploading GPS tracks</a>. Only machines which have done the key-pair setup process can do scp, sftp or rsync.
|
||||
|
||||
<h3>Learning how to use this software</h3>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user