From 73f1693ffb7c75ede26111e928fa1d1346d11c8a Mon Sep 17 00:00:00 2001
From: "Philip Sargent (muscogee)"
psurvex
-"A Survex compatible cave survey data processor for Psion palmtop computers" by Matt Ryan, 2004.
to
for
---
handbook/computing/getsurvex.html | 2 +-
handbook/computing/keyexchange.html | 14 ++++++-------
handbook/computing/logbooks-parsing.html | 4 ++--
handbook/computing/troggle-ish.html | 6 +++---
handbook/computing/winlaptop.html | 26 ++++++++++++------------
5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/handbook/computing/getsurvex.html b/handbook/computing/getsurvex.html
index 979918124..50b5ca575 100644
--- a/handbook/computing/getsurvex.html
+++ b/handbook/computing/getsurvex.html
@@ -75,7 +75,7 @@ There is currently no working version and it has not been updated since 2007.
+"A Survex compatible cave survey data processor for Psion palmtop computers" by Matt Ryan, 2004.
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
diff --git a/handbook/computing/keyexchange.html b/handbook/computing/keyexchange.html
index e8f6fe7dd..7968e73b6 100644
--- a/handbook/computing/keyexchange.html
+++ b/handbook/computing/keyexchange.html
@@ -74,16 +74,16 @@
If you accepted the defaults, the public key will be called id_rsa.pub and it will be in ~/.ssh/ - check that this is the case.
+
Be extremely careful to type ">>" and not ">" in the fourth line below otherwise you will delete everyone's logins.
$ ssh expo@expo.survex.com
-
expo@expo:~$ cd .ssh
-
expo@expo:~$ cp -p authorized_keys authorized_keys.backup
-
expo@expo:~/.ssh$ cat keys/id_rsa.pub >>authorized_keys
-
expo@expo:~/.ssh$ ./list-keys.sh
-
expo@expo:~/.ssh$ cat list-of-key-owners
+
expo@expo:~$ cd .ssh
+
expo@expo:~$ cp -p authorized_keys authorized_keys.backup
+
expo@expo:~/.ssh$ cat keys/id_rsa.pub >>authorized_keys
+
expo@expo:~/.ssh$ ./list-keys.sh
+
expo@expo:~/.ssh$ cat list-of-key-owners
-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:
+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:
anathema.device@crowley
This is documented on the logbook user-documentation page as even expoers who can do nothing else technical can at least write up their logbook entries. -
[ Yes this format needs to be re-done using a proper structure:
+
[ Yes this format needs to be re-done using a proper structure:
it's on the to-do list...]
diff --git a/handbook/computing/troggle-ish.html b/handbook/computing/troggle-ish.html
index 8ff66a7e8..84a185ac8 100644
--- a/handbook/computing/troggle-ish.html
+++ b/handbook/computing/troggle-ish.html
@@ -20,7 +20,7 @@
-
-<div class="logentry">
+<div class="logentry">
</div">
+
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.
@@ -63,7 +63,7 @@ how to use it and how to tidy up afterwards.
The first thing to do is to read: "Troggle: a novel system for cave exploration information management", by Aaron Curtis, CUCC.
Two things to remember are
At one time Martin Green attempted to reimplement troggle as "stroggle" using flask instead of Django at git@gitorious.org:stroggle/stroggle.git (but gitorious has been deleted).
A copy of this project is archived by Wookey on wookware.org/software/cavearchive/stroggle/. -
There is also a copy of stroggle on the backed-up, read-only copy of gitorious on "gitorious valhalla"
+
There is also a copy of stroggle on the backed-up, read-only copy of gitorious on "gitorious valhalla"
stroggle code
stroggle-gitorious-wiki
but note that this domain has an expired ertificate so https:// complains.
diff --git a/handbook/computing/winlaptop.html b/handbook/computing/winlaptop.html
index fa14f0d42..820d6cb81 100644
--- a/handbook/computing/winlaptop.html
+++ b/handbook/computing/winlaptop.html
@@ -14,17 +14,17 @@
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.
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.
Linux people like to use links. 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.
The links you are most likely to come across are that what looks like
-/home/expo/expoweb is really just a link to the folder /home/expo/repositories/hg/expoweb,
+/home/expo/expoweb is really just a link to the folder /home/expo/repositories/hg/expoweb,
and that
expoweb/essentials.gpx
is a link to the file /home/expo/expofiles/gpslogs/essentials/essentials2019.gpx
@@ -69,7 +69,7 @@ There are two types of linux links: hard links and symbolic links. Symbolic link
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.
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. -
So on a machine with WSL enabled, create an ordinary cmd window and get into the WSL environment using the wsl command:
+
So on a machine with WSL enabled, create an ordinary cmd window and get into the WSL environment using the wsl command:
Similarly expoweb is full of bloat from fat images and surveys and one 82MB thesis that got checked in and then removed. Clearing that out is a good idea. I have a set of 'unused fat blob' lists which can be stripped out with git-gilter. It's not hard to make a 'do the conversion' script, ready for sometime after expo 2019 has calmed down.
- Ths section is entirely out of date (June 2014), and moved here for historic interest
D:\CUCC-Expo\expoweb\ wsl
-
-which puts you into the WSL environment with a new command prompt, e.g.
+
+which puts you into the WSL environment with a new command prompt, e.g.
philip@Muscogee:/mnt/c/Users/Philip$
From 112dd3c713f61913a50e07a7f7fa5c16b4085bb7 Mon Sep 17 00:00:00 2001
From: "Philip Sargent (muscogee)"
and
are now conformant
---
1623/161/a-z.htm | 4 +-
entrance_data/1623-264.html | 2 +-
entrance_data/1623-277.html | 2 +-
geolog.htm | 2 +-
handbook/bierbook.html | 2 +-
handbook/computing/menudesign.html | 2 +-
handbook/festering/brewery.html | 2 +-
handbook/geartape2018.html | 6 +-
handbook/index.htm | 16 +-
handbook/logbooks.html | 2 +-
handbook/manual.html | 4 +-
handbook/survey/getin.htm | 4 +-
handbook/survey/newcave.html | 6 +-
handbook/survey/newwallet.html | 6 +-
handbook/survey/status.html | 12 +-
handbook/travelcosts.html | 2 +-
handbook/treasurer.html | 2 +-
handbook/website-history.html | 8 +-
infodx.htm | 2 +-
intro.htm | 2 +-
links.htm | 2 +-
noinfo/scripts/logbk.pl | 2 +-
years/1981/cavdev.htm | 16 +-
years/1987/geolog.htm | 4 +-
years/1990/drill.htm | 4 +-
years/1991/log.htm | 28 +--
years/1992/log.htm | 46 ++---
years/1995/log.htm | 104 +++++------
years/1996/gps.htm | 12 +-
years/1996/index.htm | 4 +-
years/1996/report.htm | 12 +-
years/1997/report.htm | 12 +-
years/1998/index.htm | 30 +--
years/2000/goals.htm | 46 ++---
years/2000/report.htm | 6 +-
years/2006/travel.html | 26 +--
years/2007/reports/report.html | 2 +-
years/2008/gearforexpo.html | 2 +-
years/2008/mission.html | 2 +-
years/2008/trips.html | 2 +-
years/2012/logbook.html | 10 +-
years/2013/logbook.html | 28 +--
years/2013/topcamplist.html | 2 +-
years/2014/logbook.html | 2 +-
years/2016/logbook.html | 10 +-
years/2018/hc-cave-description-bits.html | 26 +--
years/2018/logbook.html | 228 +++++++++++------------
years/2019/logbook.html | 10 +-
years/2020/index.html | 2 +-
49 files changed, 384 insertions(+), 384 deletions(-)
diff --git a/1623/161/a-z.htm b/1623/161/a-z.htm
index 8cfbd0b7a..d2513d889 100644
--- a/1623/161/a-z.htm
+++ b/1623/161/a-z.htm
@@ -13,11 +13,11 @@
src="ovview.png" width=40 height=40>
-
+
+ src="ausbut.png" width=40 height=40>
+
(Tag "2005-05" placed 2005)
+
(Replaces tag "2017-pw-01" placed in 2017)
diff --git a/handbook/website-history.html b/handbook/website-history.html
index c7344e3fe..e3a67eccd 100644
--- a/handbook/website-history.html
+++ b/handbook/website-history.html
@@ -162,7 +162,7 @@ tunneldata has also been migrated to git, and renamed 'drawings' as it includes
The loser repo and expoweb repo need more care in migration. Loser should have the old 1999-2004 CVS history restored, and maybe toms annual snapshots from before that, so ancient history can usefully be researched (sometimes useful). It's also a good idea to add the 2015, 2016 and 2017 ARGE data we got (in 2017) added in the correct years so that it's possible to go back to an 'end of this year' checkout and get an accurate view of what was found (for making plots and length stats). All of that requires some history rewriting, which is best done at the time of conversion.
+
Automation on expo.survex.com
-Website update
+Return to
+Website update
-
+