expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-22 07:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chnaging "key exchnage" to "key-pair setup" as it sounds less intimidating

Browse Source
This commit is contained in:
Philip Sargent 2020-01-10 01:49:11 +00:00
parent 9c2249f985
commit 08aecd5ebd
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handbook/computing/ftpusage.html
View File

@ -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>

2
handbook/computing/keyexchange.html
View File

@ -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.

2
handbook/computing/qstart-hg.html
View File

@ -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>

4
handbook/computing/yourlaptop.html
View File

@ -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>

2
handbook/fzconfig.html
View File

@ -12,7 +12,7 @@
<p>This software works identically on both Windows and Linux.
<p>Filezilla is an "FTP client". This means that it connects to servers using a venerable service called "file transfer protocol" i.e. FTP. It looks a bit like copying files from one folder to another on your desktop but it works between different machines.
<p>These are instructions for installing it on your own machine. But <em>none of this will work</em> until you have also done the <a href="computing/keyexchange.html">key exchange</a> procedure.
<p>These are instructions for installing it on your own machine. But <em>none of this will work</em> until you have also done the <a href="computing/keyexchange.html">key-pair setup</a> procedure.
<ul>
<li> Download the software from here <a href="https://filezilla-project.org/download.php?show_all=1">Filezilla Downloads</a>. ( Obviously Linux users will use their usual package management system instead of doing this download.)
<li>Now install the software following <a href="https://wiki.filezilla-project.org/Client_Installation">the instructions here</a>.

2
handbook/gpxupload.html
View File

@ -65,7 +65,7 @@ GPX files are small enough for email systems, so don't be shy of adding them as
<h3>Slightly less simple upload instructions</h3>
<p>Using your own laptop on expo, or after you return from expo,
use the "more complex" instructions for <a href="uploading.html">uploading photos</a> to /uploads/,
but upload your GPX files instead. But <em>none of this will work</em> on your own laptop until you have also done the <a href="computing/keyexchange.html">key exchange</a> procedure.
but upload your GPX files instead. But <em>none of this will work</em> on your own laptop until you have also done the <a href="computing/keyexchange.html">key-pair setup</a> procedure.
<h2 id="uploadgpx">More complex upload instructions</h2>
<p>OK you now have a file produced by your device, something like XTR20170714X2345.GPX .

6
handbook/manual.html
View File

@ -69,7 +69,7 @@ Appendices:
</p>
<p>This password is all you need to log in to troggle and to use the troggle control panel (very few people need to do this). But if you want to update webpages (a much more common requirement) or to edit the software itself (very rare), then
you will also need to get a login (register a key with the server). See <a href="computing/keyexchange.html">key exchange</a> for details.
you will also need to get a login (register a key with the server). See <a href="computing/keyexchange.html">key-pair setup</a> for details.
<p>Pushing cave data to the ::loser:: and ::drawings:: repositories also needs a key. So cavers entering their cave survey data have to use a machine on which this already set up. These machines are
the <i>expo laptop</i> and the laptop '<i>aziraphale</i>' which live in the potato hut during expo. If you want to use your own laptop then
@ -128,14 +128,14 @@ they have to be 'pulled' from the repo (on teh server machine) onto the webserve
<p>Setting your own laptop so that it can do everything the <i>expo laptop</i> can do is quite a
complicated process. At a minimum you will be an experienced software nerd already and will have git, mercurial and a text editor installed and you will know how to use them.
You will have done the
<a href="computing/keyexchange.html">key exchange</a> process - which you can only do entirely on your own if
<a href="computing/keyexchange.html">key-pair setup</a> process - which you can only do entirely on your own if
you have access to the <i>expo laptop</i>.
<p>See <a href="computing/yourlaptop.html">setting up your own laptop</a> for the full list of software we use and where to get it.
<p>Note that the instructions are primarily for people using Linux with some help for those using Windows. If you are a Mac user then you are on your own.
<h3><a id="editthispage">Using 'Edit This Page'</a></h3>
<p>This can be used to edit web pages without installing any software or doing any key exchange. It even works if your laptop is a Mac.
<p>This can be used to edit web pages without installing any software or doing any key-pair setup. It even works if your laptop is a Mac.
<p>This is the capability that you can see in the top-left-hand menu on any website page if you <a href="/accounts/login/">log in to troggle</a> using the <a href="#usernamepassword">cavey:beery password</a>.
<p>'Edit This Page' is a troggle capability edits the file served by the webserver but it does not update the copy of the file in the
repository (the invese of the problem described above as 'Mercurial Website Hack'). To properly finish the job you need to

8
handbook/upload-expert.html
View File

@ -11,17 +11,17 @@
<h2>Experts only</h2>
<p>If you have been using FTP since the last century or are particularly keen on doing everything using the command-line, read on.
<p>With the new server in 2019 it is harder to configure scp or sftp (or ssh or rsync) because the server needs a key exchange
<p>With the new server in 2019 it is harder to configure scp or sftp (or ssh or rsync) because the server needs a key-pair setup
setting up first. So while scp (once working) is now
more secure than it was, we are forced to allow ordinary ftp to allow experienced but non-key-exchanged expoers' laptops or phones to upload photos
to the server. This is worse than it was as the password is now sent in clear.
<p>So it is important that the ordinary ftp access is restricted to the /uploads/ folder tree.
See <a href="computing/keyexchange.html">key exchange instructions</a> for how to arrange with an admin for this to be done for your device.
See <a href="computing/keyexchange.html">key-pair setup instructions</a> for how to arrange with an admin for this to be done for your device.
<h3>Using scp - requires key exchange for the device</h3>
<h3>Using scp - requires key-pair setup for the device</h3>
<p>Works on Windows (using winscp), Linux (using scp), and no doubt
mac and android with other tools. If you have Windows 10 and <a href="https://msdn.microsoft.com/en-gb/commandline/wsl/about">have installed bash</a>, then you can use scp.</p>
@ -59,7 +59,7 @@ give you a norton-commander-style 2-pane UI as well).</p>
<h3>Expo laptops</h3>
<p>The <i>expo laptop</i> has got the key exchange set up on it so it is configured for Filezilla to use sftp not ftp but this is invisible to normal use.
<p>The <i>expo laptop</i> has got the key-pair setup set up on it so it is configured for Filezilla to use sftp not ftp but this is invisible to normal use.
<h3>Using WebDAV</h3>
This no longer works as we had to change the folder permissions for /uploads/. Sorry.

6
handbook/uploading.html
View File

@ -117,7 +117,7 @@ and then click on the "Connect" button at the bottom of the sub-window.
<a href="fzexample.png" border=2><img src="fzexample.png" align=center width=65%></a><br>(Click to enlarge).
<p><img src="https://wiki.filezilla-project.org/favicon.ico" width=64 style="float:right; margin: 10px">For installing and pre-configuring Filezilla on a new machine see <a href="fzconfig.html">FileZilla install instructions</a> which will set you up pointing at the correct folder automatically. But <em>none of this will work</em> on new machine until you have also done the <a href="computing/keyexchange.html">key exchange</a> procedure.
<p><img src="https://wiki.filezilla-project.org/favicon.ico" width=64 style="float:right; margin: 10px">For installing and pre-configuring Filezilla on a new machine see <a href="fzconfig.html">FileZilla install instructions</a> which will set you up pointing at the correct folder automatically. But <em>none of this will work</em> on new machine until you have also done the <a href="computing/keyexchange.html">key-pair setup</a> procedure.
<h3>Automated magic</h3>
<p>Note that uploading photos does not automatically update the view
@ -131,7 +131,7 @@ at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> i
<h2 id="morecomplex">Using your own laptop</h2>
<p>To use your own laptop on expo, or after you return from expo, you need need to use FTP. So become an <a href="#experienced">experienced user</a> first.
<p>You will need to know the expo password but <em>none of this will work</em> until you have also done the <a href="computing/keyexchange.html">key exchange</a> procedure.</p>
<p>You will need to know the expo password but <em>none of this will work</em> until you have also done the <a href="computing/keyexchange.html">key-pair setup</a> procedure.</p>
<p><img src="https://wiki.filezilla-project.org/favicon.ico" width=64 style="float:right; margin: 10px">To install and configure Filezilla on your machine see <a href="fzconfig.html">FileZilla install instructions</a> which will set you up pointing at the correct folder automatically.
@ -154,7 +154,7 @@ at <a href="http://expo.survex.com/photos/">http://expo.survex.com/photos/</a> i
<li>the target folder: <span style="font-family: monospace">/uploads/</span>, or it may appear as <span style="font-family: monospace">/expofiles/uploads/</span>
<li>the port number: 21 (if you leave this blank it will probably work)
</ol>
<p>But <em>none of this will work</em> until you have also done the <a href="computing/keyexchange.html">key exchange</a> procedure. On a phone this means that you will also need to install a terminal (command line) app. See <a href="computing/yourlaptop.html">your machine</a> instructions, the Android bits.
<p>But <em>none of this will work</em> until you have also done the <a href="computing/keyexchange.html">key-pair setup</a> procedure. On a phone this means that you will also need to install a terminal (command line) app. See <a href="computing/yourlaptop.html">your machine</a> instructions, the Android bits.
<ol>
<li>Install the <a href="http://www.lysesoft.com/products/andftp/">andftp</a> app onto your Android phone using the Google Play Store and allow it to access your files and photos on your phone (just click on the popup to do this).
<li>Click on the icon that looks like a "plus" synbol in a circle