From 26906aac1c757b097a3e38b38b5060b7d14a2c65 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Tue, 18 Jun 2019 15:35:34 +0100 Subject: [PATCH 1/2] Warnings about uploading requiring ssh keys. To be fixed & expanded asap. --- handbook/computing/gpxupload.html | 11 +++++++++++ handbook/computing/uploading.html | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/handbook/computing/gpxupload.html b/handbook/computing/gpxupload.html index daa04601d..172740d5c 100644 --- a/handbook/computing/gpxupload.html +++ b/handbook/computing/gpxupload.html @@ -45,6 +45,17 @@ Congratulations. You now have your track recorded using GPS as a GPX file.

Upload instructions

+ + +

ALL THIS IS NOT WORKING

+

We have moved the server to new hardware in a new location, and everything that used the former "cavey:beery" password +for file transfer is now not working. We have to use public/private keys instead on this new server (which is free +by the way, so why we are using it). +

The only good method for the next few days is to email things to a nerd: Wookey or myself or whoever.. +

+

Watch this space for updates.. Philip 18/6/2019 + +

Simple upload instructions

    diff --git a/handbook/computing/uploading.html b/handbook/computing/uploading.html index 4a11d4b64..a1b244498 100644 --- a/handbook/computing/uploading.html +++ b/handbook/computing/uploading.html @@ -14,6 +14,16 @@ href="http://expo.survex.com/photos/">http://expo.survex.com/photos/
    which is the end result. But all you have to do is to upload the photos to the right place. A hidden script does the hard work to make it all look nice. + +

    ALL THIS IS NOT WORKING

    +

    We have moved the server to new hardware in a new location, and everything that used the former "cavey:beery" password +for file transfer is now not working. We have to use public/private keys instead on this new server (which is free +by the way, so why we are using it). +

    The only good method for the next few days is to email things to a nerd: Wookey or myself or whoever.. +

    +

    Watch this space for updates.. Philip 18/6/2019 + +

    If you are really lazy (or really a beginner) you can use the initial simple method (using /uploads/ ) for the photos you have taken of cave entrances for cave survey and prospecting purposes. But please rename the filenames of the photos intelligently, e.g. "big-hole-near-path-to-fgh.jpg", or From 0621bb8f5f5c10b1b23892df821cd3736c4d2741 Mon Sep 17 00:00:00 2001 From: expo on server Date: Wed, 26 Jun 2019 20:27:06 +0100 Subject: [PATCH 2/2] Correct Holiday to Holliday in logbook --- years/2018/logbook.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/years/2018/logbook.html b/years/2018/logbook.html index 8d66240d5..6da674522 100644 --- a/years/2018/logbook.html +++ b/years/2018/logbook.html @@ -317,28 +317,28 @@ and headed out.

    2018-07-09
    -
    Lydia Clare Leather, Mike Butcher, Michael Holiday
    +
    Lydia Clare Leather, Mike Butcher, Michael Holliday
    Fisch Gesicht
    Rerigged the cave entrance, to pendulum pitch and all the way to blitzen boulavard.
    T/U 8 hours
    2018-07-10
    -
    Lydia Clare Leather, Mike Butcher, Michael Holiday
    +
    Lydia Clare Leather, Mike Butcher, Michael Holliday
    Fisch Gesicht, pushing to liquid luck
    Pushed past survey station 14C, found the phreatic tube lead to a small chamber (pissing pot) then continued left to a big pitch. Bolted, Rigged. Michael nearly killed Lydia --> called liquid luck.
    T/U 10 hours
    2018-07-13
    -
    Lydia Clare Leather, Mike Butcher, Michael Holiday
    +
    Lydia Clare Leather, Mike Butcher, Michael Holliday
    Fisch Gesicht, pushing phreatic flies and surveying liquid luck
    Surveyed from 14C to 22. Michael bolts, lydia and Mike survey. Mike made a dry stone wall. Mike found Toto chamber.
    T/U 14 hours
    2018-07-14
    -
    Lydia Clare Leather, Mike Butcher, Michael Holiday
    +
    Lydia Clare Leather, Mike Butcher, Michael Holliday
    Fisch Gesicht, Pushing Urinal and fettling rope/rigging
    Mike and Michael did more dry stone walling. More gardening. Followed the free attic opposite liquid luck ledge ti findthe Urinal. Bolted and rigged to an awkward body sized squeezing, thatr smelt of pee, having pissed down B. Boulavard. But possible free attic continuation.
    T/U 7 hours
    @@ -352,7 +352,7 @@ Tom joined Mike and Lydia, surveyed free attic frys and Urinal, found thgat Urin
    2018-07-15
    -
    Lydia Clare Leather, Mike Butcher, Michael Holiday, Tom Crossley
    +
    Lydia Clare Leather, Mike Butcher, Michael Holliday, Tom Crossley
    Fisch Gesicht, Found Ulysses

    Took photos, Mike and Michael go down to crystal crumble, found stalactites, pretty. Tom bolted coral corner, pretty formations. Traversed round Toto chamber on a false floor to the continuation into conintuation of free attic flys called phreatic becomes meander rift, (bolted) and dind a large opening with left and right junction (very false floor) called odious odium. Taking a right turn along the false floor leads to a vast floor now called Ulysses (after the Frans Ferdinand song Michael was singing). Yet to be dropped due to its very unstable nature. Did some gardening but a lot of work needs doing. Left turn at odium, leads to a true floor, leads to multiple boulder chokes and meander in approximately the direction of Ulysses with short pitches not dropped. More photos on the way out. Michael gets ill. Wees a lot.

    lots of pee, very loose, less ice than last year, lots of key-hole passage.