expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-01-30 23:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing <br> to <br /> for <!DOCTYPE html>

Browse Source
This commit is contained in:
Philip Sargent 2020-03-05 23:19:47 +00:00
parent db1050315d
commit 73f1693ffb
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handbook/computing/getsurvex.html
View File

@ -75,7 +75,7 @@ There is currently no working version and it has not been updated since 2007.
<p>
<a href="https://code.google.com/archive/p/psurvex/">psurvex</a>
"A Survex compatible cave survey data processor for Psion palmtop computers" by Matt Ryan, 2004.<br>
"A Survex compatible cave survey data processor for Psion palmtop computers" by Matt Ryan, 2004.<br />
My task was to write a new program which could read the data from an external file,
ideally one which resembled a .svx file as much as possible.
Psurvex supports

14
handbook/computing/keyexchange.html
View File

@ -74,16 +74,16 @@
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-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>
<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.
<tt><font color=red">$</font> ssh expo@expo.survex.com
<br><font color=blue">expo@expo:~$</font> cd .ssh
<br><font color=blue">expo@expo:~$</font> cp -p authorized_keys authorized_keys.backup
<br><font color=blue">expo@expo:~/.ssh$</font> cat keys/id_rsa.pub >>authorized_keys
<br><font color=blue">expo@expo:~/.ssh$</font> ./list-keys.sh
<br><font color=blue">expo@expo:~/.ssh$</font> cat list-of-key-owners
<br /><font color=blue">expo@expo:~$</font> cd .ssh
<br /><font color=blue">expo@expo:~$</font> cp -p authorized_keys authorized_keys.backup
<br /><font color=blue">expo@expo:~/.ssh$</font> cat keys/id_rsa.pub >>authorized_keys
<br /><font color=blue">expo@expo:~/.ssh$</font> ./list-keys.sh
<br /><font color=blue">expo@expo:~/.ssh$</font> cat list-of-key-owners
</tt>
This adds your key on to the end of the authorized keys list, runs a little script to extract the names of all the people who have added keys (24 keys as of Jan.2020) and prints out the list. You should see that the last line says:<br>
This adds your key on to the end of the authorized keys list, runs a little script to extract the names of all the people who have added keys (24 keys as of Jan.2020) and prints out the list. You should see that the last line says:<br />
<span style="font-family:monospace; size=x-small; background-color: lightgray">anathema.device@crowley</span>
<li>Now your public key is installed for your second machine. You check that it works by logging into the expo server using ssh from your second machine.
</p>

4
handbook/computing/logbooks-parsing.html
View File

@ -61,9 +61,9 @@ Calculating GetPersonExpeditionNameLookup for 2017
<h3 id="history">The logbooks format</h3>
<p>This is documented on the <a href="..logbooks.html#format">logbook user-documentation page</a> as even expoers who can do nothing else technical can at least write up their logbook entries.
<p>[ Yes this format needs to be re-done using a proper structure:<br>
<p>[ Yes this format needs to be re-done using a proper structure:<br />
<code><pre>
&lt;div class="logentry"&gt;<br>
&lt;div class="logentry"&gt;<br />
<span style="text-decoration: line-through wavy red;">&nbsp;&nbsp;&nbsp;&nbsp;</span>
&lt;/div"&gt;</pre></code>
it's on the to-do list...]

6
handbook/computing/troggle-ish.html
View File

@ -20,7 +20,7 @@
</ul>
<br>
<br />
<tt><em>Everything here should be updated or replaced - this page just records a lot of unfinished ideas.
Most people will not want to read this at all. This is for speleosoftwarearcheologists only.</em>
@ -63,7 +63,7 @@ how to use it</a> and <em>how to tidy up afterwards</em>.
<p>The first thing to do is to read: "<a href="../../../troggle/docsEtc/troggle_paper.odt" download>Troggle: a novel system for cave exploration information management</a>", by Aaron Curtis, CUCC.</em>
<p>Two things to remember are
<ul>
<li>that troggle is just one of several cave-survey management online software systems. CUCC EXPO is not the only caving expedition with a substantial nerd community.<br><br>
<li>that troggle is just one of several cave-survey management online software systems. CUCC EXPO is not the only caving expedition with a substantial nerd community.<br /><br />
<li>that troggle is part of a 40-year ongoing project and lives in a soup of several disparate scripts all working on the same data
</ul>
@ -92,7 +92,7 @@ All Survex | Scans | Tunneldata | 107 | 161 | 204 | 258 | 264 | Expo2016 | Expo2
<p>At one time Martin Green attempted to reimplement troggle as "stroggle" using <a href="https://www.fullstackpython.com/flask.html">flask</a> instead of Django at
<a href="https://en.wikipedia.org/wiki/Gitorious">git@gitorious.org:stroggle/stroggle.git</a> (but gitorious has been deleted).</p>
<p>A copy of this project is archived by Wookey on <a href="http://wookware.org/software/cavearchive/stroggle/">wookware.org/software/cavearchive/stroggle/</a>.
<p>There is also a copy of stroggle on the backed-up, read-only copy of gitorious on "<a href="https://gitorious.org/">gitorious valhalla</a>"<br>
<p>There is also a copy of stroggle on the backed-up, read-only copy of gitorious on "<a href="https://gitorious.org/">gitorious valhalla</a>"<br />
<a href="https://gitorious.org/stroggle/stroggle.git/">stroggle code</a></br>
<a href="https://gitorious.org/stroggle/stroggle-gitorious-wiki.git/">stroggle-gitorious-wiki</a></br>
but note that this domain has an expired ertificate so https:// complains.

26
handbook/computing/winlaptop.html
View File

@ -14,17 +14,17 @@
<p>It used to be quite simple: software equivalents existed for Windows for everything we needed. Since Spring 2018, we unfortunately have to use ssh keys. This has simply added an extra step for most things, but has made one thing (rsync) really quite hard to get working.
<p>What makes this all much more tiresome is that Microsoft are introducing some cool new ways of interacting with Linux systems but these are new and need some effort to get configured correctly. See the end of this page for more details.
<ul>
<li><a href="#well">Things that already work well with a Windows laptop</a><br>
- Editing the handbook webpages, typing up SVX files and transcribing the logbook, <br>
<li><a href="#well">Things that already work well with a Windows laptop</a><br />
- Editing the handbook webpages, typing up SVX files and transcribing the logbook, <br />
- Anything where the file-transfer to the expo surver is via the version control software (TortoiseHg or Git-for-Windows)
<li><a href="#problems">Things that cause problems</a><br>
- filenames and unintentional duplication because links are not understood by Windows,<br>
<li><a href="#problems">Things that cause problems</a><br />
- filenames and unintentional duplication because links are not understood by Windows,<br />
- sFTP or scp for more than a handful of files
<li><a href="#hard">Things that are really, really hard</a><br>
- using rsync <br>
- large-scale updating of several folders at once on expofiles without overwriting other people's work (which means using rsync)<br>
<li><a href="#hard">Things that are really, really hard</a><br />
- using rsync <br />
- large-scale updating of several folders at once on expofiles without overwriting other people's work (which means using rsync)<br />
- well not "hard" exactly, but complicated with lot of steps that are easy to get wrong and with poor feedback as to whether you have done each step correctlyS
<li><a href="#bold">Things for the bold</a><br>
<li><a href="#bold">Things for the bold</a><br />
- using WSL2, Linux virtual machines and Docker containers
</ul>
@ -45,7 +45,7 @@
<p>Linux people like to use <em>links</em>. This is where there is really only one file, but it is referred to by different names. This is particularly useful when a file is moved, but you want people who have got the old location to still be able to find it. This happens quite a lot when updating handbooks.
<p>
The links you are most likely to come across are that what looks like
<span style="font-family:monospace; size=x-small; background-color: lightgray">/home/expo/expoweb</span> is really just a link to the folder <span style="font-family:monospace; size=x-small; background-color: lightgray">/home/expo/repositories/hg/expoweb</span>, <br>
<span style="font-family:monospace; size=x-small; background-color: lightgray">/home/expo/expoweb</span> is really just a link to the folder <span style="font-family:monospace; size=x-small; background-color: lightgray">/home/expo/repositories/hg/expoweb</span>, <br />
and that
<span style="font-family:monospace; size=x-small; background-color: lightgray">expoweb/essentials.gpx</span>
is a link to the file <span style="font-family:monospace; size=x-small; background-color: lightgray">/home/expo/expofiles/gpslogs/essentials/essentials2019.gpx</span>
@ -69,7 +69,7 @@ There are two types of linux links: hard links and symbolic links. Symbolic link
<li>Be careful not to copy any links using sFTP and instead recreate them manually on the Windows filesystem using right-click "Create shortcut".
<li>You will have to find out what to make the shortcut link to by logging in to the server (using a PuTTy ssh logon) and doing <span style="font-family:monospace; size=x-small; background-color: lightgray">"ls -l"</span> in the folder where the link is.
<li>But later, when re-uploading edited files from Windows to the server, Filezilla will see the Windows shortcut as a ".lnk" file which it will upload, but which will mean nothing to the linux server receiving it. So you would have to manually recreate the symbolic link by logging into the server using ssh and using the "ln -s" command. Yuk.
<br>
<br />
<li>Even if you use scp instead of sFTP, it does the same stupid thing when copying from a linux filesystem to a Windows filesystem. The PuTTy package includes <span style="font-family:monospace; size=x-small; background-color: lightgray">pscp.exe</span> but even if you force it to use the scp protocol like this:
<tt>
pscp -scp expo@expo.survex.com:expoweb/essentials.gpx .
@ -82,12 +82,12 @@ it downloads a <em>copy</em> of the contents of essentials.gpx and not a link.
<h3 id="hard">Things that are really quite involved</h3>
<p>The core problem is integrating the PuTTy key management software (pagent.exe) with a terminal window. We need a terminal window to run rsync as none of the packaged software (Filezilla, PuTTy) includes an rsync client.
<p>The solution we have now is to use WSL1 and to create another key, distinct from the PuTTy one, and to upload that key to the expo server. Because this is treating WSL as if it were a different machine requiring its own key quite separate from the Windows key, we expect this to continue to work when WSL2 becomes the default behaviour on Windows10.
<p>So on a machine with WSL enabled, create an ordinary cmd window and get into the WSL environment using the wsl command:<br>
<p>So on a machine with WSL enabled, create an ordinary cmd window and get into the WSL environment using the wsl command:<br />
<span style="font-family:monospace; size=x-small; background-color: lightgray">
D:\CUCC-Expo\expoweb\ <font color=red>wsl</font>
</span>
<br>
which puts you into the WSL environment with a new command prompt, e.g.<br>
<br />
which puts you into the WSL environment with a new command prompt, e.g.<br />
<span style="font-family:monospace; size=x-small; background-color: lightgray">
<span style="color: green">
philip@Muscogee</span><span style="color: yellow">:/mnt/c/Users/Philip</span>$