@@ -59,7 +59,7 @@ you can use FTP using this app and this method.
Configure connection on Linux/Unix
-scp only works if you have key exchange set up. +
scp only works if you have key-pair setup set up.
- You can upload files using 'scp' command (to upload localfile.file to expofiles/uploads/remotename.file)
diff --git a/handbook/computing/keyexchange.html b/handbook/computing/keyexchange.html index b5143d083..c805d8595 100644 --- a/handbook/computing/keyexchange.html +++ b/handbook/computing/keyexchange.html @@ -1,21 +1,24 @@ + - +
Handbook placeholder page CUCC Expedition Handbook
-Cryptographic Key Exchange
-As of the server move in spring 2019 you need authorisation on the expo server to log in. This takes the form of an ssh key. You generate it on the machine you use for access, then send the public half to the server. Once done all logins are automatic - no passwords needed.
+Key-Pair Setup
+As of the server move in spring 2019 you need authorisation on the expo server to log in. This takes the form of an ssh key. You generate a key-pair on the machine you use for access, then send the public half to the server. Once done all logins are automatic - no passwords needed.
'ssh' is 'secure shell' and is widely used for secure access to machines and services.
What do I need to do?
You will need to run ssh-keygen/PuTTYgen on your device, email the public key to someone who already has ssh access (Wookey, Paul Fox, Philip Sargent, Sam Wenham). Once installed by them you should be able to log in as 'expo' over ssh (and other software like tortoise will also use this behind the scenes). This only needs doing once (for any machine you want access from).
-Explanation of how ssh keys work.
+Our own documentation for installing PuTTy on Windows. + +
Explanation of key-pairs and the ssh-keygen command.
A public key file looks like this: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEApc9+PAMrDtWa8D8/ZneLP2X9UOYmTITAhTd2DRs8SE+NDgis5pYo/Xhtbrg86ePMAC2YM5xAkYx3jNA/VZ/PkB3gTzYJW3T/zTH+cc7YeWhy9l1zIMaYqeyvw7FxeSBaR4XoLPVtVUlai8DUDiWAEm7VvOKj1n68z1LxVh1MZXLm7btckf6fske2YU9UpjqT++AURQvFheRJ4la7KBJ7LXZ3A/TQ7HQaTpqmcQKCiRj/yZ5FNHxBk0M+ShbHUtz1GhXRCMJ3LZHaw24OJyVJ8YNzBiStBb1qcWCXX7HR9CUNhz7tA5HZyc1lau/1vwk8MSe93lyyLntzJKkqmkW/cQ== wookey@khi.e. a long string of characters with 'ssh-rsa' at the start and a 'user'@'machine' ID at the end.
@@ -36,6 +39,8 @@ - If not, run ssh-keygen. It may ask about passwords: you can add a password for extra security, but a passwordless key is fine, and more convenient.
- That will create a file: .ssh/id_rsa.pub in your home directory. Email that file to one of the admins listed above. +
- Run Pageant (it will have been installed in your Start menu, otherwise find it it "C:\Program Files\PuTTY\pageant.exe"). Click the "Add Key" button. Select the .ppk file in the pop-up file list. You only need to do this once.
+
MacOS
@@ -43,13 +48,48 @@ - Erm, dunno...please fill in
- Erm, dunno...please fill in - +
- Install the Termius app + which is a ssh client. The free version does ssh but not sFTP. Follow the Termius documentation and in-app help to generate a key pair and then use the same process to upload the public key to the expo server as for Linux machines, i.e. email it to an admin. + +
- There is apparently a version of the Termius app + for iPhones. Please try it out and document it here. +
- Erm, dunno...please fill in + +
- On your new machine, generate a key-pair. Since you are probably using a different operating system on your second machine, read the instructions above for the relevant OS. Yes you will be generating a new key. Do not re-use the key you had already. +
- This time though, you will want to be sure that the key has a meaningful label. On Linux this means something like this: + ssh-keygen -C "anathema.device@crowley" +(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. +
- +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. +
- Now copy the public key file to your first machine, the one that is already set up with a working key-pair setup with the expo server. Using email to yourself is easiest. +
- Now upload the public key using sFTP (Filezilla configured to use sFTP, which uses Pageant by default) to expo.survex.com/home/expo/.ssh/keys/ +
- Now login to the expo server on your first machine and do these commands:
+Be extremely careful to type ">>" and not ">" in the fourth line below otherwise you will delete everything. +$ 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 + +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 + - 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.
+
+
Note that by using sFTP like this we avoid having to use a text editor over ssh. If you know what you are doing you can do this of course, but the above process is less likely to cause problems for a Windows user setting up their phone as a second device where they are not experienced with vi or nano. + + + +
- cmd window - the old faithful going all the way back to MS-DOS. But no path to an rsync.exe executable as standard. +
- PowerShell terminal window - nope, no rsync.
- bash window - installed by default when you install gitforwindows. Unfortunately while this MINGW32 setup includes a comamnd-line git executable it doesn't include rsync.
- cygwin - a cmd terminal where you have downloaded and installed Cygwin. Yes, if you have selected the rsync package you will be able to run the rysnc executable, but it won't have access to the cyptographic key so it can't connect to the expo server. Please feel free to work out how to make this work. A more recent, graphical variant is Swan. -
- PowerShell terminal window - nope, no rsync. -
- Windows Subsystem for Linux aka WSL1 available on all Windows10 machines since the November 2019 update. +
Windows Subsystem for Linux aka WSL1 available on all Windows10 machines since the November 2019 update. (The first versions of WSL1 didn't do the ssh key-pair setup easily: "fairly annoying because of how out-to-lunch SSH Agent is" but it works now.)
-
-
- Install it like this. This does all we want. This works using a key generated by its own version of ssh-keygen if you follow the instructions above about putting it in the right place. This will shortly be made obsolete by: -
- WSL2 - the new wonderful system which will solve all our problems, make the tea and carry our gear up to topcamp. Allegedly. +
- WSL1 Install it like this. This does all we want. This works using a key generated by its own version of ssh-keygen if you follow the instructions above about putting it in the right place. +
- WSL1: Converting Windows paths to Linux paths and vice-versa. +
- WSL1 will shortly be made obsolete by WSL2 - the new wonderful system which will solve all our problems, make the tea and carry our gear up to topcamp. Allegedly.
- The 2019 WSL2 release includes a selection of complete Linux kernels. If you want to use this, then please do - and then write the handbook documentation too. But beware that it has two different modes which behave differently. +
- Canonical Multipass - a completely different alternative to WSL: more isolation, more understandable behaviour (?)
- A full virtual Linux machine running using a hypervisor such as VirtualBox which has its own virtual Linux filesystem. This setup has the advantage that you don't have to partitition your hard drive but the disadvantage that you can't get at any of the files from Windows itself except via a network protocol \\wsl$. Which may be no hardship.
- Cool WSL tricks - running Windows commands from WSL environment and running Linux commands from Windows terminal.
- deep integration - Don't use gitforwindows, install the linux git client in WSL2 -
- Converting Windows paths to Linux paths and vice-versa.
+
- using-github-credentials-in-wsl2 - How to use gitforwindows and WSL to connect to GitHub.
- WSL2 & Visual Studio Code diff --git a/handbook/computing/yourlaptop.html b/handbook/computing/yourlaptop.html index 1bd7774a1..2ad4471f5 100644 --- a/handbook/computing/yourlaptop.html +++ b/handbook/computing/yourlaptop.html @@ -75,6 +75,7 @@ but all the recommended software here is open source (and please don't install p
+For Windows users only:
-
+
- Read our instructions for setting up TortoiseHg in Tortoise-on-Windows. (But this won't work at all until you set up the key-pair setup using PuTty/Pageant.)
- PuTTY 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).
- Git for Windows
- TortoiseGit - GUI interface to git
@@ -121,7 +122,7 @@ to excessively careful when naming files and survex names and be exceptionally careful when using rsync.
-
The handbook has documents where it is necessary to use scp or sftp to manage large files in 'expofiles'. See Experts: Uploading files, Uploading files and Uploading GPS tracks. Only machines which have done the key exchange process can do scp, sftp or rsync. +
The handbook has documents where it is necessary to use scp or sftp to manage large files in 'expofiles'. See Experts: Uploading files, Uploading files and Uploading GPS tracks. Only machines which have done the key-pair setup process can do scp, sftp or rsync.
Learning how to use this software
@@ -131,8 +132,11 @@ to this page which will be merged in here eventually. + - Introduction to using Tunnel - article by Dave Loeffler. This is really good and should be read first. +
- The Tunnel tutorial - installation notes and a wiki of examples and tutorials -
- bitbucket.org/goatchurch/tunnelx - documentation and source code in the bitbucket repository system. +
- Tunnel - master copy since August 2019. This is where the software is actively developed and is the most up to date copy, but the documentaiton is not as complete as in the other locations. +
- bitbucket.org/goatchurch/tunnelx - documentation and old source code in the bitbucket repository system.
Cheat lists and quick reminders
@@ -163,6 +167,7 @@ a wiki on github discussing workflows to generate centerlines, GEOTIFF and QGIS- Online brokenlinkcheck tool - does not install on your laptop. Limited to 3,000 pages.
- Another online brokenlinkcheck tool - does not install on your laptop. Limited to 2,000 pages but breadth-first rather than depth-first, so it covers a different chunk of the expo website. +
- Yet another link-checker, only 1,500 pages checked but oh-so-stylish results presentation. Very informative.
- Xenu Link Sleuth - install on Windows to do comprehensive link check.
- Linkchecking with wget - command line methods on Linux
CUCC Austria Expeditions: Expo Accounting Policy + + + + + + + +CUCC Expedition Handbook
+Expo Accounting Policy
+ +Contents
+ +-
+
- Part 1: How Expo is financed + +
- Income and Expenditure +
- The Bank of Expo +
- The Expo Bills +
- Part 2: How to be Expo Treasurer + +
- Role of the Expo treasurer +
- Timetable of events +
- Other Tips +
- Summary + +
-
+
-
+
Introduction
+The two parts deal with the theory and practice of Expo accounting respectively.
+ +These documents were written to explain how we ran the Expo accounts in the years 1997-1999. I hope they will help smooth the hand-over to future treasurers; they may be particularly useful if there are no ex-treasurers in Cambridge.
+ +Archived copies of past expo accounting policy can be found here. Read the most recent one: +
-
+
- Expo accounts policy 2008 +
- Expo accounts policy 2011 +
- Expo accounts policy 2013 +
Expo will undoubtedly change as the years go by; please try to keep these documents up to date, the files in order and ensure a smooth hand-over to your successor. Good luck!
+ + +Part 1: How Expo is financed (The Theory)
+ +Expo is ongoing. Each year's Expo inherits equipment and a little money from its predecessor; similarly, we should leave next year's Expo a reasonable stock of equipment and 'float' money.
+ + +Income and Expenditure
+ +The money to run Expo comes from two sources: principally from each year's participants, and secondarily through grants from bodies such as the Ghar Parau Foundation. In addition, numerous companies have provided sponsorship, mainly in the form of food.
+ +Most Expo costs are paid in the UK and 'in the field' by members of Expo. All these expenses during expo are recorded in the Expo Bier Book and Sesh Book - usually in euros. +After the expedition, the Expo treasurer processes this data to work out who owes and who is owed money. Everyone settles up before the next Expo (hopefully!).
+ +Expo incurs cost in the following areas:
+ +-
+
- Transport to and from Austria +
- Travel in Austria +
- Food +
- Camping supplies (gas, dish cloths, etc.) +
- Campsite fees - paid to the Gasthof at the end of Expo +
- Expo equipment purchases and maintenance. +
[Note that in 2020 we are considering introducing an emissions policy to encourage low-carbon behaviour such as car-sharing and trains rather than nearly-empty cars and planes.] + +
In addition, we coordinate various services for members:
+ +-
+
- Discounted cheap gear orders (some years). +
- Insurance - not any more +
- Expedition T-shirts +
- A system of 'swaps', which enable members to loan, each other money, to be repaid with the Expo bills. This also covers things such as the Expo Dinner at the Gasthof. +
+-
+
- Pay a deposit.
+ - Keep receipts, give them to the expedition treasurer. +
- If you are in any doubt whether the expedition will reimburse an expense do not incur +it before obtaining the expedition treasurer’s agreement.
- Fill in the relevant pages of the Bier Book fastidiously.
+- Where possible, enter details of your expenses on the Expo computer.
+- Leave money when you leave Austria in order to cover your share of the campsite bill.
+- Pay your bill within a reasonable timeframe after the accounts are finalized.
+ + + +CUCC and Expo have separate bank accounts, often administered by separate people; both are run to break even over the year. Expo works in partnership with CUCC to prevent unnecessary duplication of resources; CUCC equipment is used on Expo and vice-versa. Apart from these mutual efficiency gains, Expo and CUCC do not subsidise each other.
+ +The Bank of Expo
+This is an online system which does accounting. It is not a bank: it just keeps records of how expenses are allocated and who has paid what. See the Bank of Expo webpage for a longer description and all the documentation. + +
The Expo Bills
+ +The bill each person receives depends on:
+ +-
+
- Their expenditure on behalf of Expo +
- Their travel as part of Expo +
- The length of time they spend on Expo (from food, camping & travel in Austria costs) +
- The number of nights at basecamp - tourist tax is due on camping fees +
- The number of nights up the mountain - for topcamp food and equipment +
- Whether they go caving (the equipment expenditure is divided equally among the cavers) +
- Personal costs, such as bier, insurance, T-shirts +
- Any swaps they have made with other expedition members +
- Whether they are employed or not and whether Expo received any grants. +
- Whether they have received an Expo Bursery +
How each of these areas has been dealt with traditionally is described below. Future treasurers may wish to change this, but should be prepared for 'heated debate'...
+ + +Expenditure on behalf of Expo
+ +Reasonable Expo expenses recorded in the bier book will be refunded. The Expo treasurer determines what is reasonable, but generally Expo only pays for what it gets, and only buys what it needs.
+ +Time spent on Expo
+ +The daily costs of Expo (food, campsite fees, gaz, fuel for stoves, dishcloths, etc) are added up and a per-person-per-night cost evaluated. Each member is then charged according to the number of days he/she spent on Expo. The number of nights on expo, and whether they were at basecamp or not, are recorded in the Expo Bier Book
+ + +Gone caving
+ +In the past the cost of equipment purchase and maintenance were divided equally among everyone who went caving, usually irrespective of how long they were on Expo; this was to encourage people to make good use of the gear and make it easier for people (often students) to spend the full 5 weeks on Expo. [The caver fiddle factor (normally either 0 or 1) is used in applying this charge]. In recent years this policy has been modified to more precisely represent the costs, and encouragement of poor students done through a separate bursery mechanism.
+ + +Personal costs
+ +The popular/cheap Austrian Bier Gösser is bought communally. Each member's bier consumption is recorded in the Bier Book and the appropriate amount charged to them. A similar scheme operates for lemonade and radler.
+ + + +Swaps and Seshs
+ +The Expo Sesh Book is used for sessions and group purchases, such as when one person pays for a meal or several Hallstatt pedalo tickets.
+ +Personal stuff bought with Expo food shopping can also be managed through the Expo Sesh Book. Shared meals, including those eaten at the Gasthof at basecamp, have their costs shared through the Sesh Book. +
If someone runs out of cash on Expo, another member can lend him or her some money that is documented in the Sesh Book. + +
Expo doesn't pay for personal food/drink, only that consumed at basecamp or up the mountain.
+ + + + +Expo grants
+ +Grants may come from the GPF, other funding bodies or through students from their college. Expo sometimes uses some of this money to purchase specific high capital items; in 1999 this was a six-berth tent and two mobile phones, in 2018 it was for half a Cavelink radio system. The remaining money may be managed as a bursery or divided amongst the unwaged members on Expo, using the grantshare fiddle factor. Grantshare ranges from 0 for no entitlement to 1 for full entitlement.
+ +Intellectual property rights
++Photographers retain copyright of their material, but give Expo the 'right to reproduce' their photographs for Expo and CUCC journals, slideshows, etc. This assignment of right to reproduce is assumed when a member arrives at expo. + +
Now read about How to be the expo treasurer. + +
+ + + + + + diff --git a/handbook/fzconfig.html b/handbook/fzconfig.html index c687b4c56..e7ee9f5b3 100644 --- a/handbook/fzconfig.html +++ b/handbook/fzconfig.html @@ -12,7 +12,7 @@This software works identically on both Windows and Linux.
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. -
These are instructions for installing it on your own machine. But none of this will work until you have also done the key exchange procedure. +
These are instructions for installing it on your own machine. But none of this will work until you have also done the key-pair setup procedure.
- Download the software from here Filezilla Downloads. ( Obviously Linux users will use their usual package management system instead of doing this download.)
- Now install the software following the instructions here.
diff --git a/handbook/geartape.html b/handbook/geartape.html
index 185533bd4..26192f57c 100644
--- a/handbook/geartape.html
+++ b/handbook/geartape.html
@@ -9,11 +9,13 @@
-
Gear tape colours for Expo 2019
+Gear tape colours for Expo 2020
+TO BE UPDATED FOR 2020
Geartape lists for CUCC and previous expo years
@@ -63,14 +65,7 @@ Silver gray
- Expo Planning Guide - How to plan and orgnise expo.
- Expo leader checklist - For leaders: check these before you leave UK. -
- Expo treasurer's guide - For treasurers: tasks, tips. +
- Expo treasurer's guide - For treasurers: tasks, tips, accounting policies.
- Treasurer
- Collects deposits to fund gear-buying. Keep track of accounts and sends out expo bills a month or two after expo returns. Provides expo -bire and sesh books. +bire and sesh books. See the explicit treasurer's checklist and guide.
- Sponsorship
- If you are going to pursue sponsorship, start early (you will be competing with many similar groups and most potential sponsors will @@ -40,7 +40,9 @@ closely with sponsorship officer and club Tackle Master. gear out to Austria, on a shoestring budget with a limited number of cars, and people coming-from/going-to various places are daunting. The job mostly involves collating info and badering people -regularly. Starting early saves everyone money. +regularly. Starting early saves everyone money. See the explicit transport checklist and guide. +
- Caving Priorities +
- This should be the fun bit, but thee is a long grind in getting the previous years' survey data and QMs sorted out - the previous years expoers will need a lot of chivvying.
- Project officers
- If there is a special project which has its own special needs (radios,
aerial photos or whatever), it may be best to have one person specifically
diff --git a/handbook/manual.html b/handbook/manual.html
index ec7746229..bbfac0c67 100644
--- a/handbook/manual.html
+++ b/handbook/manual.html
@@ -69,7 +69,7 @@ Appendices:
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 key exchange for details. +you will also need to get a login (register a key with the server). See key-pair setup for details.
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 expo laptop and the laptop 'aziraphale' 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
Setting your own laptop so that it can do everything the expo laptop 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 -key exchange process - which you can only do entirely on your own if +key-pair setup process - which you can only do entirely on your own if you have access to the expo laptop.
See setting up your own laptop for the full list of software we use and where to get it.
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.
Using 'Edit This Page'
-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. +
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.
This is the capability that you can see in the top-left-hand menu on any website page if you log in to troggle using the cavey:beery password.
'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 diff --git a/handbook/phone.htm b/handbook/phone.htm index 6e19b1607..13082afe1 100644 --- a/handbook/phone.htm +++ b/handbook/phone.htm @@ -72,7 +72,7 @@ you in German) is to dial *101# ("0 BALANCE" in the contacts list in the call but results in you getting an SMS-like message containing the balance details. There's no charge for this.
-Adding credit
+Adding credit
If you need to buy more credits for a phone the simplest way is to buy it online using a credit card.
The next simplest is to buy a "B.Free" A1 top-up ("bon") at the Post Office (closes 1200-1400 for lunch) and to use a webpage to credit it to the phone SIM. diff --git a/handbook/planning.html b/handbook/planning.html index 2cdf468d2..9bedc7d68 100644 --- a/handbook/planning.html +++ b/handbook/planning.html @@ -1,5 +1,7 @@ +
+CUCC Austria Expeditions: Expo Planning Guide @@ -17,6 +19,7 @@- Gear Order - What gear to order
- Food Order - What food to order
- Flapjack - Flapjack recipes and amounts
+- Gear tape - maintain geartape page as people commit to come
- Transport: getting people and gear to Expo diff --git a/handbook/survey/getin.htm b/handbook/survey/getin.htm index b519331e0..a0231c7b6 100644 --- a/handbook/survey/getin.htm +++ b/handbook/survey/getin.htm @@ -1,6 +1,7 @@ +
- If it is a surface -survey, it goes in the "surface" directory; +survey, it goes in the :loser:/surface" directory;
- if it is a file of fixed points -(like GPS fixes, or map coordinates), it goes in the "fixedpts" directory; +(like GPS fixes, or map coordinates), it goes in the ":loser:/fixedpts" directory;
- if -it is a new cave on the near-plateau, put it in a new directory under "caves-1623". -
- Underground data for Steinbrückenhöhle goes in one of the -subdirectories under caves-1623/204; it may well be clear which one from what it +subdirectories under :loser:/caves-1623/204/; it may well be clear which one from what it links to, but if not, ask. @@ -52,25 +52,27 @@ links to, but if not, ask.
- Use Unix line endings (i.e. \n not \r\n).
- Use UTF-8 character encoding. +
- NO UMLAUTS.
- Cave numbers are written without any leading zeros at all (in filenames, survey names, or anything else!). -
- Entrances have station names such as p204b. In the event of the tag +
- Entrances have station names such as p204b. In the event of the tag location being different from the entrance location, the tag point - should be named with a "t" instead, e.g. t204b. + should be named with a "t" instead, e.g. t204b.
- No full stop (.) characters in station names.
@@ -117,8 +119,8 @@ it can be a good idea to nest surveys in one file:
*end 2050-01
or you can create several .svx files.
-Creating several .svx files seemsto be current practice as it
-simplifies the manual process of knitting several different people's trips together.
+Creating several .svx files seems to be current practice as it
+simplifies the manual process of knitting several different people's trips together (though the online wallet system can only record one of these at the moment).
There is no restriction on the length of these names, but as they can be displayed in aven, tunnel and other such programs, it helps not to have @@ -126,7 +128,7 @@ anything too elaborate. Older versions of survex required each prefix to be unique in its first eight characters, and this is not a bad guideline to follow.
- - Car costs - crediting car owners -
- Organising travel +
- Organising travel + + +
- Coordination and coercion - why this is hard
- The 2019 travel matrix - In Googledocs diff --git a/handbook/travelcosts.html b/handbook/travelcosts.html index a2b61e7ef..3cc3d6bdf 100644 --- a/handbook/travelcosts.html +++ b/handbook/travelcosts.html @@ -1,5 +1,7 @@ + +
- The person who paid enters the full amount they spent into the Bier Book. The person who had the personal food/drink enters the cost of it as a negative food expenditure in the Bier Book.
-or
- - The person who paid enters only the amount they spent on Expo stuff into the Bier Book. The cost of the personal stuff is transferred as a swap between the paying person and the benefiting person. -
- Be kind and supportive - not imperious.
- Work with the other members of the Expo committee in pulling off yet another stormin' Expo.
- Check that last year's committee submitted the grant applications.
- Help promote Expo and collect Expo deposits and forms. -
- Work with the CUCC main committee to share basic caving equipment. -
- Determine, by consultation with the other Expo committee members, what purchases need to be made in the UK. -
- Organise, with the CUCC treasurer, discount group purchases at gear shops.
- Operate the Expo bank account. -
- *Coordinate transport to & from Expo. -
- Create the Expo Bier Book -
- Process the Expo Bier Book to produce Expo Bills. +
- Explore last year's Online Bank of Expo data to see how it all works +
- Then, create the Bank of Expo for this next year - you may need a nerd to help you +
- Create the Expo Bier Book and Sesh Book when you know most of the people have signed up - you may need a nerd to help you +
- Process the Expo Bier Book and Sesh Book through Bank of Expo to produce Expo Bills.
- As far as possible, maintain or improve the financial health of Expo.
- Submit a Treasurer's Report to anyone who needs one (e.g. grant awarding bodies). -
- Provide a summary of the Expo Accounts to the Journal, web site and Expo Report. +
- Provide a summary of the Expo Accounts to the CUCC Journal, web site and Expo Report.
- Make sure the following year's grant applications are submitted correctly.
- Introduce your successor to the post of treasurer, preferably before you retire.
- Work with the other members of the Expo committee in pulling off yet another stormin' Expo
Enough? Perhaps they should have more than one person doing all this! - Determine, by consultation with the other Expo committee members, what purchases need to be made in the UK. +
- Organise, with the CUCC treasurer, discount group purchases at gear shops. +
- Work with the CUCC main committee to share basic caving equipment. +
- Organise the expo food orders: porridge, curry etc. +
- Sponsorship -
- Top Camp Meals -
- Equipment & Fettling co-ordination (CUCC Tackle Master?) -
- Any others you can get: -
- OIC T shirts -
- OIC Flapjack -
- OIC Training Events (First Aid, SRT practice, etc.) (CUCC Training Officer?) -
- Etc. -
- Top Camp Meals - noodles, curries, dehydrated food +
- Equipment & Fettling co-ordination (CUCC Tackle Master) +
- Expo training weekend(s) +
- Social media coordination and publicity
- By email - the expo mailing list +
- An announcement on the closed Expo Facebook page +
- An announcement on the public Expo Facebook page +
- An announcement on the other Expo social media mechanisms
- CUCC pub meets -
- With the postal invitations to the CUCC Annual Dinner (early Lent Term?) +
- With the invitations to the CUCC Annual Dinner (early Lent Term?)
- The CUCC Annual Dinner (normally at the end of Lent Term)
- The CUCC Alternative Dinner (normally at the end of Easter Term)
- CUCC meets where EXCS members turn up
- Anything else you can think of.
- The Front Part
- Expected dates for all members of Expo -
- Bier Tally, More Bier Tally (to 100+ Biers) -
- Limo Tally (to 50+ Limos) -
- Nights Tally -
- Time Underground Tally -
- Expo Travel Game (record of peoples' arrival and departure) -
- Expo Weather +
- Name list - with phone number & gear-tape colours for each expoer written in by hand +
- Bier, Limo, Dunkel Tally, More Bier Tally (to 100+ Biers) +
- Nights on Expo & Time Underground Tally
- Exchange rates during Expo, the price of Gösser, limo, etc. -
- Stamps -
- Moose Tally -
- Next Of Kin -
- 'Money owing to...' page and 'Money owed by...' page +
- 'Money owing to...' page and 'Money owed by...' page
- for each member
- for each of several as yet unknown people
- for each account (i.e. Expo, CUCC main, CUCC meets -
- for the kitty
- The Late (end of Expo) Part +
- The Late (end of Expo) Part - or in the Logbook
- Rope at end of Austria: Length by year and diameter
- Hangers Tally, end of Expo @@ -299,33 +190,33 @@
- Quotes
- Orders for surveys, T-shirts, etc.
- Expo Dinner Fiasco details +
- Tally of wasp and bee stings
- Many rants are simple misunderstandings; try to explain what and why you are taking such and such a point of view.
- Face-to-face meetings are much more effective than drawn-out email discussions. -
- Part 1 described the principle of the Expo finances: the sources of income and expenditure and the principles behind the Expo billing system. +
- Part 2 described the role of the treasurer and details on the practical side of being Expo Treasurer.
- Expedition Handbook
+
diff --git a/handbook/upload-expert.html b/handbook/upload-expert.html
index b4a1bc9c0..22de9232b 100644
--- a/handbook/upload-expert.html
+++ b/handbook/upload-expert.html
@@ -11,17 +11,17 @@
Experts only
If you have been using FTP since the last century or are particularly keen on doing everything using the command-line, read on. -
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 +
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.
So it is important that the ordinary ftp access is restricted to the /uploads/ folder tree. -See key exchange instructions for how to arrange with an admin for this to be done for your device. +See key-pair setup instructions for how to arrange with an admin for this to be done for your device. -
Using scp - requires key exchange for the device
+Using scp - requires key-pair setup for the device
Works on Windows (using winscp), Linux (using scp), and no doubt mac and android with other tools. If you have Windows 10 and have installed bash, then you can use scp.
@@ -59,7 +59,7 @@ give you a norton-commander-style 2-pane UI as well). - the target folder: /uploads/, or it may appear as /expofiles/uploads/
- the port number: 21 (if you leave this blank it will probably work)
-
But none of this will work until you have also done the key exchange procedure. On a phone this means that you will also need to install a terminal (command line) app. See your machine instructions, the Android bits. +
But none of this will work until you have also done the key-pair setup procedure. On a phone this means that you will also need to install a terminal (command line) app. See your machine instructions, the Android bits.
- Install the andftp 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).
- Click on the icon that looks like a "plus" synbol in a circle
diff --git a/handbook/website-history.html b/handbook/website-history.html
index 8cb72829b..64689f867 100644
--- a/handbook/website-history.html
+++ b/handbook/website-history.html
@@ -29,7 +29,7 @@ every cave encountered. Previously, such work required hours of slide rule or lo
several expeditions, such processing was completed after the expedition by a FORTRAN program
running on shared mainframe time. BASIC programs running on personal computers took over with
the release of the BBC Micro and then the Acorn A4. A full history of this period is described in
-Taking Expo Bullshit into the 21st Century - a story of the data management system up to 1996.
+Taking Expo Bullshit into the 21st Century - a story of the data management system up to Spring 1996. [This was less than five years after Tim Berners-Lee published the world's very first web page on 6th August 1991. So the expo website is nearly as old as the web itself.]
Survex - cave surveying
In the 1990s, Olly Betts and Wookey began diff --git a/noinfo/create_dplong_table.py b/noinfo/create_dplong_table.py index 9ef58b25b..8b450b610 100755 --- a/noinfo/create_dplong_table.py +++ b/noinfo/create_dplong_table.py @@ -179,7 +179,7 @@ with ours highlighted. Rather than maintaining our own independent database, it seems much more sensible to link to the much more frequently updated list here maintained by Theo Pfarr. For comparison, Bob Gulden of the American NSS maintains a list here of the world's longest +href="http://www.caverbob.com/wlong.htm">here of the world's longest caves.
diff --git a/years/2003/report.htm b/years/2003/report.htm index 0c09207ab..900853d30 100755 --- a/years/2003/report.htm +++ b/years/2003/report.htm @@ -9,7 +9,7 @@Expedition Report: CUCC Totes Gebirge 2003
This is the text that was submitted for publication in the January 2004 -issue of +issue of Speleology magazine. It has been slightly edited for the web (some links have been added) but is otherwise verbatim.
diff --git a/years/2018/logbook.html b/years/2018/logbook.html index 72b417b35..68c1ca0b1 100644 --- a/years/2018/logbook.html +++ b/years/2018/logbook.html @@ -1742,7 +1742,7 @@ in under an hour.Day 2
We took our long rope +14m rope to the muddy, drafty end of Radio Silence where the previous (Anthony/Chris/Hydra) camping trip had got to + unenthusiastically started to rig (George) and -to shiver (Becka + Adam). After some time (we cracked and got intot he bothy) George +to shiver (Becka + Adam). After some time (we cracked and got into the bothy) George shouted that he was past the worst of the drips (we're haviung a drought, itwould probably be nasty in the rain) + we should come down. diff --git a/years/2019/index.html b/years/2019/index.html index e7f3d93c1..9f833f9de 100644 --- a/years/2019/index.html +++ b/years/2019/index.html @@ -1,5 +1,7 @@ + +Expo 2019: Organisation and mission statement @@ -51,23 +53,25 @@ On expo website: - Photos sesh book every week (backup).
-
Last day of expo
+Last days of expo
-
+
- Things left at Undergound Camp (?) 2019 +
- Things left at Top Camp 2019 (image file only, not transcribed yet) +
- Ropes out of cave at end expo (some notes in logbook)
- Photos of bier book complete (backup)
- Photos of accounts and sesh book complete (backup).
- Things left at Base Camp 2019 -
- Things left at Top Camp 2019 -
- Things left at Bivvy Camp (?) 2019 -
- Things left at Undergound Camp (?) 2019 -
- Ropes out of cave at end expo +
Post-Expo Completion
-
-
- 2019 surveying completion +
- 2019 surveying completion
- Call-out book scanned
- Caver's Forum expo report - Caving UK +
- Logbook entries transcribed
- Things needed for next year 2020 +
- Accounts done and debts collected
Expo 2020: Organisation and mission statement @@ -7,14 +9,11 @@Expo 2020
Expo 2020: Organisation
-Link to last year: 2019 +Link to last year: 2019
+Back to Expo Planning Guide. + -Every Expo - ongoing jobs
--
-
- Github: Survey notes to do -
- Expo website updating(old list, revise/delete?) -
Pre-Expo Planning
Using camcaving (or other wiki-type software): @@ -22,6 +21,13 @@ Using camcaving (or other wiki-type software): - Task tracking expo 2020
- Who and when planning page +PDF docs: + + On expo website:
- 2019 surveying progress @@ -35,6 +41,7 @@ On expo website:
- Things bought 2020
- Pre-Expo Training Blog on ukcaving.com +
- Geartape colours to be updated as members commit to come
- 2020 surveying progress +
- Add credit to both phones - Can be done online just before Expo + +
- 2020 surveying progress - Monitor this to help decide priorities
- During-Expo Blog on ukcaving.com -
- Photos of Call-out book every week(backup) +
- Photos of Call-out book every week (backup)
- Photos of bier book every week - bier and expenses (backup)
- Photos sesh book every week (backup).
- To do.. finally and completely de-rig Organhohle bivvy stocks? +
- Photos for expo archive +
- New cave anchor proposals +
- Introduce new cavers to alpine expedition caving in relatively safe situation. +
- Mentorship outline proposal +
Expo reports
@@ -43,11 +50,13 @@ On expo website: -During Expo data entry
+During Expo - mostly data entry
-
-
2020 Mission statement
+Criteria for a successful expo
To discuss.. (not just x miles of newly surveyed cave)
Organisational targets
-To do.. de-rig Organhohle bivvy stocks. -
Photos for expo archive +
-
+
Training targets
-Introduce new cavers to alpine expedition caving in relatively safe situation. +
-
+
Every Expo - ongoing jobs
+
Back to Expo Planning Guide.
Android
- --
+
iOS
+-
+
Your second machine
+OK, you have an uploaded and usable key and you can ssh into the expo server. Now you want to set up a key for another machine such as your phone. You don't need a nerd admin now, you can do this yourself. But be extremely careful to follow this exactly. If you innocently rename the files to something that appears more sensible it won't work. +
-
+
This is NOT a tutorial. This is a set of reminders for people who already know all this stuff.
Since 2019 all use of version control software requires that you -have cryptographic key exchange already set up before any of this will work on your own machine. +have key-pair setup already set up before any of this will work on your own machine.
You can, however, do all this on the expo laptop as this has already been configured with the right keys.
-
@@ -41,7 +43,7 @@ have cryptographic key exchange already set up be
Using Mercurial/TortoiseHg in Windows
-Read the instructions for setting up TortoiseHG in Tortoise-on-Windows. But this won't work at all until you set up the key exchange using PuTty/Pageant. +
Read the instructions for setting up TortoiseHG in Tortoise-on-Windows. But this won't work at all until you set up the key-pair setup using PuTty/Pageant.
In Windows: install Mercurial and TortoiseHg of the relevant flavour from https://tortoisehg.bitbucket.io/ (ignoring antivirus/Windows warnings). This will install a submenu in your Programs menu)
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
diff --git a/handbook/computing/troggle-ish.html b/handbook/computing/troggle-ish.html index 86f4a3575..8ff66a7e8 100644 --- a/handbook/computing/troggle-ish.html +++ b/handbook/computing/troggle-ish.html @@ -100,9 +100,9 @@ but note that this domain has an expired ertificate so https:// complains.CUCC wiki on troggle
-CUCC still has an archive list of things that at one time were live tasks, reproduced here: -from camcaving.uk/Documents/Expo/Legacy/Misc/... -
Troggle is a system under development for keeping track of all expo data in a logical and accessible way, and displaying it on the web. At the moment, it is [no longer] under development athttp://troggle.cavingexpedition.com/ +
CUCC still has an archive list of things that at one time were live tasks: +from camcaving.uk/Documents/Expo/Legacy/Misc/... and that page is reproduced in the table below (so don't worry if the URL link goes dark when CUCC reorganise their legacy pages). +
Troggle is a system under development for keeping track of all expo data in a logical and accessible way, and displaying it on the web. At the moment, it is [no longer] under development at http://troggle.cavingexpedition.com/ But note that this is Aaron's version of troggle, forked from the version of troggle we use. Aaron uses this for the Erebus expedition.
diff --git a/handbook/computing/winlaptop.html b/handbook/computing/winlaptop.html index 93063d313..fa14f0d42 100644 --- a/handbook/computing/winlaptop.html +++ b/handbook/computing/winlaptop.html @@ -32,7 +32,7 @@Anything where the file upload and download is done via the verson control client software works really well.
Key management using PuTTy
-Most Windows software that we recommend "just works" if you have set up PuTTy and have done the cryptographic key exchange and are running a local ssh agent (pagent) automatically at boot up on your laptop. +
Most Windows software that we recommend "just works" if you have set up PuTTy and have done the key-pair setup and are running a local ssh agent (pagent) automatically at boot up on your laptop.
Some software, such as the commercial (but free) GitKraken, requires that you click a checkbox to say that you are "using local SSH agent" rather than specifying ssh private keys explicitly (File->Preferences->Authentication in GitKraken).
Some software (such as FIlezilla) defaults to using the local agent and it "just works".
@@ -56,7 +56,7 @@ is a link to the file seem to have any hard links anywhere.
- What really makes things unpleasant is that sFTP software won't tell you when it comes across a link and will just do something stupid. Our recommended sFTP software - Filezilla - is guilty of this,as it pftp (PuTTY) working in eith sFTP or scp mode.. So what happens is that when you download a load of files onto your laptop using Filezilla it will simply turn every link it finds into a complete copy of the file. Then when you upload those files to the server, the copied file overwrites the link. So the server now has two files with the same content - which is a maintenance nightmare. This is painfully stupid because if it is a symbolic link there is no reason why Filezilla couldn't just create a Windows Shortcut which would do exactly the same thing. But it doesn't.
+ What really makes things unpleasant is that sFTP software won't tell you when it comes across a link and will just do something stupid. Our recommended sFTP software - Filezilla - is guilty of this,as it pftp (PuTTy) working in eith sFTP or scp mode.. So what happens is that when you download a load of files onto your laptop using Filezilla it will simply turn every link it finds into a complete copy of the file. Then when you upload those files to the server, the copied file overwrites the link. So the server now has two files with the same content - which is a maintenance nightmare. This is painfully stupid because if it is a symbolic link there is no reason why Filezilla couldn't just create a Windows Shortcut which would do exactly the same thing. But it doesn't.
So the ordinary user won't notice any problems, but the nerds behind the scenes start to cuss and shout and generally carry-on in an expletive-heavy manner.
@@ -80,9 +80,9 @@ it downloads a copy of the contents of essentials.gpx and not a 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 intot he WSL environment using the wsl command: 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: Now you have to complete the key exchange process with the new key "id_ras_wsl.pub". But you don't need anyone else's help this time as you can use PuTTy to ssh into the server and copy your key to the right place yourself.
+ Now you have to complete the key-pair setup with the new key "id_ras_wsl.pub". But you don't need anyone else's help this time as you can use PuTTy to ssh into the server and copy your key to the right place yourself.
Now finally you can use all the usual command line tools at yor wsl command line to communicate with the server with ssh, scp, rsync, such as:
So here is the current wild frontier. Currently these are the ways to get a terminal window which might work:
WSL1 also introduces a wonderful new problem of file permissions. Every file on the Windows filesystem NTFS has a set of permissions managed by the filesystem. Every NTFS file that WSL knows about (if mounted with -o metadata) acquires a completely parallel set of file permissions that "mirror" the NTFS permissions but can get out of sync. All sorts of fun results: "With network file systems, DrvFs does not set the correct Linux permissions bits on a file; instead, all files are reported with full access (0777) and the only way to determine if you can actually access the file is by attempting to open it.". This will be fixed by WSL2 which will have an entirely separate filesystem, a Virtual Hardware Disk (VHD). Which will introduce a quite different set of interesting problems.
+ WSL1 unfortunately introduces a wonderful new problem of file permissions. Every file on the Windows filesystem NTFS has a set of permissions managed by the filesystem. Every NTFS file that WSL knows about (if mounted with -o metadata) acquires a completely parallel set of file permissions that "mirror" the NTFS permissions but can get out of sync. All sorts of fun results: "With network file systems, DrvFs does not set the correct Linux permissions bits on a file; instead, all files are reported with full access (0777) and the only way to determine if you can actually access the file is by attempting to open it.". This will be fixed by WSL2 which will have an entirely separate filesystem, a Virtual Hardware Disk (VHD). Which will introduce a quite different set of interesting problems.
If you are disturbed by the instructions to produce an entirely different key for WSL1 to use when your PC already has a perfectly good PuTTy key installed on the server, then you are right. It is inelegant. But it works, the instructions are shorter and there are fewer things that go wrong. If you are terribly offended by that then you can set your PC up to use one key shared between WSL and normal-Windows as described in this October 2019 article. (Don't set up a password on the key because then you don't need to install keychain.) But beware, this sort of thing goes out of date quite rapidly and WSL2 is looming.
@@ -153,7 +155,7 @@ WSL: the Windows Subsystem for Linux, variant 1. The first versions of WSL1 didn
Things that are really quite involved
-
+
D:\CUCC-Expo\expoweb\ wsl
@@ -119,7 +119,7 @@ $
The generated key is in the current directory and you need to move them to ~/.ssh/ as is standard on Linux (which is not at all the same place that PuTTy uses to keep keys on Windows).
-
@@ -130,22 +130,24 @@ Now finally you can use all the usual command line tools at yor wsl command line
-
-WSL: the Windows Subsystem for Linux, variant 1. The first versions of WSL1 didn't do the ssh key exchange process easily: "fairly annoying because of how out-to-lunch SSH Agent is" but it works now.
-WSL1 tricks and tips
+
+
Tape diff --git a/handbook/geartape2018.html b/handbook/geartape2018.html index bf2ce4f5c..0547a52a5 100644 --- a/handbook/geartape2018.html +++ b/handbook/geartape2018.html @@ -459,7 +459,7 @@ on a particular combination of colours of electrical insulation tape, and label absolutely everything you own with the stuff. The table above shows combinations already taken. For other CUCC colour combinations already in use see CUCC gear tape. +href="https://camcaving.uk/Documents/Legacy/Gear%20Tape%20Colours%20-%20Cambridge%20University%20Caving%20Club.htm">CUCC gear tape (current gear tape page offline, so this is the legacy page).
Tape diff --git a/handbook/geartape2019.html b/handbook/geartape2019.html new file mode 100644 index 000000000..c1cf971d1 --- /dev/null +++ b/handbook/geartape2019.html @@ -0,0 +1,281 @@ + +
+ +CUCC Expedition Handbook - Gear Tape
+ + + +Gear tape colours for Expo 2019
+ +Geartape lists for CUCC and previous expo years +
++ +
| Colour - 1 + | +Name + | +Expo + |
| +Purple + | +EXPO communal property + | +2019 + |
| +Galaxy pattern + | +Michael Holliday (SUSS) + | +2019 + |
| +Silver gray + | +Corin Donne (SUSS) + | +2019 + |
| White + + | +Dickon Morris (UBSS) + | +2019 + |
| White + | +Philip Sargent + | +2019 + |
| +Blue CEB CHEMICAL + | +Michael Sargent + | +2019 + |
| +Purple toughtags + | +Cat Henry + | +Maybe + |
| +Red toughtags + | +Adam Henry + | +Maybe + |
| +Purplish-blue nail-polish + | +Daniel Heins (UBSS) + | +2019 + |
+ +
| Colour - 2 + + | +Name + | +Expo + |
| +Grey, Green + | + + +Manfred Wuits (Vienna) + | +2018 + |
| +Black, +Green + | +Jon Arne Toft + | +2019 + |
| +Brown, +Blue + | +Ruairidh Macleod + | +2019 + |
| Purple, +Yellow + | +Mark Shinwell + | +Maybe + |
| White, +Red + | +Mike Butcher (ULSA) + | +2019 + |
| White, +Red + | +Philip Sargent + | +2019 + |
| +White, +Orange + | +Alice Shackley + | +2019 + |
| White, Blue + | +Haydon Saunders + | +Maybe + |
| Blue, Yellow + | +Becka Lawson + | +2019 + |
+ +
| Colour - 3 + + + | +Name + | +Expo? + |
| Blue, White, Blue White is thin + | +Radost Waszkiewicz + | +2019 + |
| Black, White, Black + | +Reuben Harding + | +2019 + |
| Black, Red, Black Red is thin + | +Paul Fox + | +2019 + |
| Yellow, Black, Yellow + | +Tom Crossley + | +2019 + |
+
Gear-tape - labelling
+It is almost essential (for caving generally, but particularly for Expo) to settle +on a particular combination of colours of electrical insulation tape, and label +absolutely everything you own with the stuff. The table above shows combinations already taken. + +For other CUCC colour combinations already in use see CUCC gear tape (current gear tape page offline, so this is the legacy page). + + +
Tape +everything, not just your caving gear; while one karabiner looks much +like another, it's equally true that one karrimat looks much like +another. And especially your phone, phone cable, charger, charger-cable, laptop, mouse, mug/plate/cutlery - +essentially anything you want to be reasonably sure to get back.
+ ++ + + + + diff --git a/handbook/gpxupload.html b/handbook/gpxupload.html index 6bffa4253..0e6b93b5f 100644 --- a/handbook/gpxupload.html +++ b/handbook/gpxupload.html @@ -65,7 +65,7 @@ GPX files are small enough for email systems, so don't be shy of adding them as
Slightly less simple upload instructions
Using your own laptop on expo, or after you return from expo, use the "more complex" instructions for uploading photos to /uploads/, -but upload your GPX files instead. But none of this will work on your own laptop until you have also done the key exchange procedure. +but upload your GPX files instead. But none of this will work on your own laptop until you have also done the key-pair setup procedure.
More complex upload instructions
OK you now have a file produced by your device, something like XTR20170714X2345.GPX . diff --git a/handbook/index.htm b/handbook/index.htm index 986a15843..998e24ace 100644 --- a/handbook/index.htm +++ b/handbook/index.htm @@ -106,7 +106,7 @@ Things that are likely to be relevant at basecamp.
diff --git a/handbook/leader.htm b/handbook/leader.htm index 1d5581552..273aae17e 100644 --- a/handbook/leader.htm +++ b/handbook/leader.htm @@ -1,4 +1,4 @@ - + @@ -25,7 +25,7 @@ thinks that someone else will be doing it. Define responsibilities early!
Where to put your data: If in doubt, ask!. These instructions assume that you are typing it in on the expo laptop. (You can do it fom your own -laptop if you have been initiated into the deep magic of the "loser" repository +laptop if you have been initiated into the deep magic of the ":loser:" repository of the distributed version control system - see the list of repos.
Use a template
-It will be easiest if you start from one of the existing template files, -as these have lines to remind you to add various details - make sure you +
The beginner should start from the existing template file :loser:/template/template.svx +as this has lines to remind you to add various details - make sure you don't leave any blanks! Copy and rename this to where you want to put your data before editing it. Too many people have overwritten the template in the past, try not to do this yourself. +
Working by editing a .svx file from another bit of the same cave may seem like a short cut but whoever edited it may have deleted some of the helpful and useful hints that are in the template.svx file - so don't do this please, until you really know what you are doing. -
Filename and data-entry conventions
+Filename and data-entry conventions in svx files
Station names
+Station names
Every station should have a number within your survey even if it is an existing station to which you have connected. Any survey stations which @@ -143,6 +145,8 @@ cryptic for the uninitiated, it may be best not to try to link your survey to everything else so skip the next bit and read on from here.
+Plumbing your survey into the rest of the cave
+However, if you need to see your survey in relation to the rest of the dataset:
@@ -183,7 +187,7 @@ successfully, and numbered it within your own survey as station 0. Then you might create the following file: (note we don't use umlauts) -File wibble.svx +-File wibble.svx *begin wibble ; Locn: Totes Gebirge, Austria - Loser/Augst-Eck Plateau (kataster group 1623) @@ -211,18 +215,19 @@ caves/204/swings/ermintrude.svx. --> ;stn L R U D Desc ;1 0.7 0.4 0.3 0.5 RP top of boulder [and the rest of the station details] -*end wibble +*end wibbleThat lot would be typed by copying caves-1623/204/template.svx to -caves-1623/204/swings/wibble.svx and then filling in the blanks and adding your +
That lot would be typed by copying :loser:/template/template.svx to +:loser:/caves-1623/204/swings/wibble.svx and then filling in the blanks and adding your data. If you are linking to the rest of the survey then in the file -caves-1623/204/swings/allswings.svx add the lines:
+:loser:/caves-1623/204/swings/allswings.svx add the lines: --*include wibble ++ ++*include wibble *equate wibble.0 swings5.2 -Split surface and underground files
Remember not to put surface data and underground data in the same file, even if they are part of one continuous survey. You need to create two @@ -230,6 +235,7 @@ files, with a defined station for the entrance, and a suitable equate in the file which includes both surface stuff and underground stuff.
+Postprocessing and Update
Once you have your data typed in and checked, it must be run through the survey software (which on expo will be survex) and a centre line printed, both for @@ -237,7 +243,7 @@ plan and for extended elevation. Measure the print out to check that it really has printed at the scale you wanted (typically 1:500), as this has sometimes caused problems in the past.
-Now see the "Drawing it up" page.
+Return to "Survey handbook - survex format".
diff --git a/handbook/survey/qmentry.html b/handbook/survey/qmentry.html index 3daea3d7e..7c2347006 100644 --- a/handbook/survey/qmentry.html +++ b/handbook/survey/qmentry.html @@ -2,7 +2,6 @@ -Handbook - Doing a new cave - QMs @@ -84,6 +83,7 @@ drawings correctly with this sort of thing.Conclusion
Survey data recorded in .svx files is incomplete if there is no QM List data and cave description data! +
Return to "Survey handbook - survex format".
diff --git a/handbook/transport.html b/handbook/transport.html index 056328e7d..7505e6952 100644 --- a/handbook/transport.html +++ b/handbook/transport.html @@ -25,7 +25,15 @@ Organising transport is one of the biggest nightmares and the sooner we know who
The bugbear of the Expo Leader if he/she hasn't managed to find a dedicated person to do this. This is a co-ordination/coercion game. Ask everybody when they would like to go to Expo, then match those without cars of their own to those who have cars and will take passengers. Try to make sure that each vehicle that will be funded by Expo will be as fully utilised as possible (for emissions minimisation as well as cost).
+ +This game is combined with the job of getting people to commit to going on Expo at all, as some people will only go when they see their friends are going. You want to get some keen definite people to say when they'll go, then advertise this on the social media so that other people will say 'I'll go then'. Keep everybody informed of the situation with regular emails and posts to social media. People will normally see obvious car sharing opportunities, but don't be afraid to make suggestions. It's important to include the whole lists, not just those who've said they'll go already, as we always pick up a useful number of experienced latecomers.
+ +Later on, there'll be the job of determining who the full, semi-independent and independent travellers are and which vehicles are funded in full or part. This may be a bit iterative, depending on how helpful and communicative various people have been.
+Time spent on Expo
+Part 2: How to be Expo Treasurer
-The daily costs of Expo (food, campsite fees, gaz, fuel for stoves, dishcloths, etc) are added up and a per-person-per-night cost evaluated. Each member is then charged according to the number of days he/she spent on Expo.
- - -Gone caving
- -The cost of equipment purchase and maintenance are normally divided equally among everyone who went caving, irrespective of how long they were on Expo; this is to encourage people to make good use of the gear and make it easier for people (often students) to spend the full 5 weeks on Expo. The caver fiddle factor (normally either 0 or 1) is used in applying this charge.
- - -Personal costs
- -The popular/cheap Austrian Bier Gösser is bought communally. Each member's bier consumption is recorded in the Bier Book and the appropriate amount charged to them. A similar scheme operates for lemonade.
- - - -Swaps
- -If someone runs out of cash on Expo, another member can lend him or her some money that can then be repaid through the Bills. The amount is added to the debtor's bill and taken off the creditor's bill. This can also be used for group purchases, such as when one person pays for several Hallstatt pedalo tickets.
- -Personal stuff bought with Expo food shopping can be managed in one of two ways:
--
-
Either way, Expo doesn't pay for personal food/drink.
- -Swaps will only be considered if entered in both the debtor's and creditor's page in the Bier Book, or the treasurer can be reasonably sure that the debtor was aware of the transaction.
- - -Expo grants
- -Grants may come from the GPF, other funding bodies or through students from their college. Expo sometimes uses some of this money to purchase specific high capital items; in 1999 this was a six-berth tent and two mobile phones. The remaining money is divided amongst the unwaged members on Expo, using the grantshare fiddle factor. Grantshare ranges from 0 for no entitlement to 1 for full entitlement.
- - -Part 2: How to be Expo Treasurer (maybe;-)
- -This section details some things I found as Expo treasurer, which I hope will help you avoid some of my errors/worries....
+This section details some things Earl found as Expo treasurer in 1999, since updated, which we hope will help you avoid some errors and worries.
Role of the Expo treasurer
@@ -158,136 +58,127 @@So what does this Expo treasurer do? Your mission, should you choose to accept it, is as follows:
-
+
Jobs marked * are particularly large and could well be delegated if you have enough people.)
-Your task, appreciated by a few, will require time, effort and perseverance...
+Try to get someone else to do these even though they involves expo funds: +
-
+
Timetable of events
In the beginning were the grant applications. At least, there were if last year's committee remembered their responsibilities, so first check that they have been submitted! Also track down the ex-treasurer (if he didn't get you first!) and get the bank details and get yourself as a signatory to the account.
-You may find at first that the Expo committee is just you and the Expo Leader. Help him/her find and pressgang victims persuade volunteers for the other committee posts:
There are copies of letters requesting grants on the expo online systems letters archive. +
You may find at first that the Expo committee is just you and the Expo Leader. Help him/her find and pressgang victims persuade volunteers for the other committee roles:
See the checklist for running an expo in the expo planning guide.
-
-
Absolutely refuse (politely) to do any of these yourself. You have enough to do.
Deposits and Forms
-Even before you've got a full committee, start promoting Expo as the top experience it is. Start taking deposits. Ask for £100 before Expo, as installments of £40 and £60. Of course, people can pay it all at once if they want!
+Even before you've got a full committee, start promoting Expo as the top experience it is. Start taking deposits. Ask for £200 before Expo, as installments of £80 and £120. Of course, people can pay it all at once if they want!
The deposits are to give Expo some cash to buy gear. Try and get most people to pay up; people paying for a lot of gear in Cambridge (e.g. for top camp meals and the chief fettler) may request not to pay their deposit. Certainly get at least the first deposit of anyone potentially 'unreliable' (i.e. you haven't seen caving or hasn't been on Expo before) before you spend any money on him/her. Hassle everybody else too :-)
+See the instructions to expoers on what their paperwork responsibilities are as this sets out payment terms and says in writing that someone is only registered as coming on the expo after thier deposit has been recieved. It says "If you are late paying the deposit you may need to pay your entire expected cost, not just the deposit, before you can attend. The expo treasurer will tell you what is required". This was because we had one person just turn up without warning. (He was happy to pay, he just wasn't aware of the procedures.) -
A good way to get the deposits is with the Expo form. This is completed by each person wanting to go on the Expo. Have a look at past year's forms (stored on the PWF). The forms get you, as treasurer, (hopefully) all the information you'll need to start organising Expo. People are often pretty lousy at completing or even starting their forms, but you'll need an idea of when people want to go on Expo and a list of contact addresses etc. Distribute the forms at:
+A good way to get the deposits is with the Expo form. This is completed by each person wanting to go on the Expo. Have a look at past year's forms. The forms get you, as treasurer, (hopefully) all the information you'll need to start organising Expo. People are often pretty lousy at completing or even starting their forms, but you'll need an idea of when people want to go on Expo and a list of contact addresses etc. Distribute the forms:
-
+
There is an on-line version of the form on the PWF, and possibly even a Perl script for processing the responses. Find a suitable compsci or engineer to fix it; it's not difficult. The web form can be completed on-line or printed out and sent to you.
- -Advertise Expo and the web address of the form on the CUCC and EXCS mailing lists, soc-cucc@lists.cam.ac.uk and excs@survex.com respectively. You could send the form by email. If you do this, create a plain text version and send it in the body of your message. Do not send it as an attachment and certainly not as an MS Word file, or you'll get rants about compatibility with non-windows computers...
- -New requirements set by the GPF/NCA mean that all Expo members will need to be members of a club/organisation which is in turn a member of the NCA in order for Expo to get any grant money. I'm not sure whether EXCS is a member of the NCA (I doubt it), but CUCC is. So make sure people have paid their membership fees too.
+There was an on-line version of the form in 2014, and possibly even a script for processing the responses. Find a suitable nerd to fix it; it's not difficult. The web form can be completed on-line or printed out and sent to you.
+In the past requirements set by the GPF/NCA meant that all Expo members needed to be members of a club/organisation which is in turn a member of the NCA in order for Expo to get any grant money. ICheck whether this is still true.
+ +Operate the Expo bank account
This involves paying money in, writing cheques and looking after the statements. Statements are currently sent to the Expo Treasurer's address, which is changed for each treasurer. You could get them sent to Dr James Hickson, the CUCC Senior Treasurer at Pembroke. This would mean less changing of addresses, but add delay/uncertainty to your receiving the statements.
-The deposits cover most of the insurance costs. Equipment orders are normally paid for by Expo or CUCC main, with the other then repaying their share. The float money (about £850 at the end of 1999) can be used as necessary, but should be replenished at the end of each year. The float was increased from £100 at the end of 1997 when the GPF grant was recieved late. The extra money is very useful for smoothing the cash flow: in 1999 the CUCC Main and Meets accounts were emptied and the Expo Account float used, as over £3000 was spent from the accounts before Expo on tackle, tents, tshirts and insurance. Do not let the account go overdrawn.
+Equipment orders are normally paid for by Expo or CUCC main, with the other then repaying their share. The float money (about £850 at the end of 1999) can be used as necessary, but should be replenished at the end of each year. The extra money is very useful for smoothing the cash flow. Do not let the account go overdrawn.
-The Expo account is with National Westminster, number 22997253, sort code 60-04-23 (King's Parade branch). Internet banking may be available for this account, but we haven't got it yet. Remember to give the bank the signature authority forms to authorise your successor before you leave Cambridge.
- - -Transport Organisation
- -The bugbear of the Expo Treasurer... This is a co-ordination/coercion game. Ask everybody when they would like to go to Expo, then match those without cars of their own to those who have cars and will take passengers. Try to make sure that each vehicle that will be funded by Expo will be as fully utilised as possible.
- -This game is combined with the job of getting people to commit to going on Expo at all, as some people will only go when they see their friends are going. You want to get some keen definite people to say when they'll go, then advertise this on the EXCS list so that other people will say 'I'll go then'. Keep everybody informed of the situation with regular emails to the EXCS list. People will normally see obvious car sharing opportunities, but don't be afraid to make suggestions. It's important to include the whole EXCS list, not just those who've said they'll go already.
- -Later on, there'll be the job of determining who the full, semi-independent and independent travellers are and which vehicles are funded in full or part. This may be a bit iterative, depending on how helpful and communicative various people have been.
+The Expo account is with National Westminster, number 22997253, sort code 60-04-23 (Market Street branch). Remember to give the bank the signature authority forms to authorise your successor before you leave Cambridge.
-The Expo Bier Book
-The Expo Bier Book is a record of every expedition expenditure and many administrative details of Expo. Refined over many years, the format now consists of the following sections:
+The Expo Bier Bookand Sesh Book
+The Expo Bier Book and Sesh Book is a record of every expedition expenditure and many administrative details of Expo. Refined over many years, the format now consists of the following sections:
+ +The expenses and sesh swaps are also copied online into the bank of expo and the bier book and sesh book are annotated when when an expense has been transcribed. + +
The 2016 expo bierbook and seshbook were scanned and can be downloaded (13MB and 5 MB) from here: +expofiles/writeups/2016/
-
-
Anything else financial can also be included, particularly notes to the treasurer. The Bier Book, Log Book and Survey Book together make the original source documentation for each Expo.
+Anything else financial can also be included, particularly notes to the treasurer. The Bier Book, Sesh Book, Logbook, Callout Books and Survey Wallets file together make the original source documentation for each Expo.
-The Expo Kitty
+The Gasthof Payment
-The largest single bill in Austria will be the campsite bill, at about ös 55 per person per night plus electricity. Obviously the bill depends on how big Expo is; in 1999 it was over £800. How this is paid depends on how many people you have around at the end of Expo. If there are enough then the simplest method is for them just to pay Hilde and claim the cost back through the Bier Book. However, if there are not going to be enough people with sufficient cash around at the end, you should start the Expo Kitty. This is a jar, in which everyone is encouraged to leave cash towards the campsite bill. This is entered in the Bier Book as a swap to Kitty. If the kitty has too little cash, someone around at the end of Expo should use a credit card to make up the balance.
- -It's not a good idea to collect vastly more cash than we need, as it could get lost or the Austrian banks could change their bank notes before the next Expo. You could try closing the kitty when it has enough cash, though people like to get rid of their few spare schillings and may moan if others could but they can't. If there is too much in the kitty, we could either ask to pre-pay some of next year's bill, or take it back to Expo the following year.
- -If it will be needed, make sure the kitty is started early on so everyone can contribute something. If you let people freely add/withdraw cash, make periodic checks that the contents are as indicated in the Bier Book: it's quite easy for people to forget to record an entry. If you're not there at the end of Expo yourself, you'll need to put someone responsible in charge of paying the bill and bringing any remaining cash back to Cambridge.
+The largest single bill in Austria will be the campsite bill. Obviously the bill depends on how big Expo is; in 2019 it was over €2,100. How this is paid depends on how many people you have around at the end of Expo. If there are enough then the simplest method is for them just to pay Hilde and claim the cost back through the Bank of Expo. However, if there are not going to be enough people with sufficient cash around at the end, you should start collecting advance payements from attendees anticipating their eventual bills.
Produce the Expo Bills
-The Bier Book should be a complete picture of all Expo financial transactions. You can save yourself a lot of typing (possibly) if you put a blank version of the Expo spreadsheet on the Expo PC in the Potato Hut. Then people can type thier own data into the spreadsheet while on Expo, which also provides some protection against the loss of the bier book. However, you may find it difficult to track down mistakes and duplications later, particularly in Swaps transactions.
+The Bier Book and Sesh Book, as copied into the Bank of Expo, should be a complete picture of all Expo financial transactions. -
You'll receive some Bier Book entries by email, post and word of mouth after Expo, as people's credit card bills come in. Set a deadline (say, 40 days after the end of Expo) and add all entries to the Bier Book. Include all the other relevant transactions on the other CUCC accounts.
+You'll receive some Bier Book & Sesh Book entries by email, post and word of mouth after Expo, as people's credit card bills come in. Set a deadline (say, 40 days after the end of Expo) and add all entries to the Bank of Expo. Include all the other relevant transactions on the other Expo accounts.
-Once all the various expenses have been entered in the bier book (it's probably September/October by now), you're ready to tackle the spreadsheet. You don't have to use the spreadsheet, but it's best to unless you're a database wizard. Appendix B describes using the spreadsheet. Basically you remove the sheets for last years members, copy new blank pages for this year's members and then add this year's data. It's fairly straightforward, but lengthy and requires concentration.
+Once all the various expenses have been entered in the Bank of Expo (it's probably September/October by now), you're ready to tackle the spreadsheet. Here is the 2014 Expo spreadsheet - but this predates Bank of Expo, so hassle a more recent treasurer to get the latest copy. You don't have to use the spreadsheet, but it's best to unless you're a database wizard. Basically you remove the sheets for last years members, copy new blank pages for this year's members and then add this year's data. It's fairly straightforward, but lengthy and requires concentration.
+ -In 1999, the tshirts, insurance, Expo Dinner and various gear orders were handled as swaps on specific days outside Expo. The swap sum-to-zero check usefully determines that Expo is not out of pocket (or shows how much by, so you can recover this by a charge in the Misc category). It would be possible to create new categories for insurance etc, but this would require thoughtful modification to the spreadsheet structure. Don't break it! (Someone really ought to develop an Expo database...)
+What is paid for is determined by the principles described in part 1 of this document. Once all the data has been entered, check that each person has been allocated appropriate traveller, caver and grantshare values in the spreadsheet.
-What is paid for is determined by the principles described in part 1 of this document. Once all the data has been entered, check that each person has been allocated appropriate traveller, caver and grantshare values.
-The bills have traditionally been paid by the debtors writing cheques to the creditors. Some debtors pay the Expo Account, which then pays any outstanding amount due to the creditors. This means you match each debtor to a creditor and tell both of them that the debtor will pay the creditor. This means the creditor can hassle the debtor if necessary without you having to bother. You can also match husbands & wives or people who live in the same part of the country together. You can make sure that reliable people pay the Expo account and that less reliable people pay their friends. Usually only the Expo account has to write more than one cheque.
-When sending out the Expo bills, give the addresses of the creditors. Send individual emails personally to each member, rather that announcing it on communal emails. This reduces the amount of ranting about 'Why's my bill more than his?'. However, if anyone asks, have the relevant data ready.
+When sending out the Expo bills, include the addresses of the creditors. Send individual emails personally to each member, rather that announcing it on communal emails. This reduces the amount of ranting about 'Why's my bill more than his?'. However, if anyone asks, have the relevant data ready.
-Andy Waddington (austria @ pennine.demon.co.uk) would be interested in some accounting trivia, such as the number of Gössers drunk, the times underground, etc.
+Record accounting trivia, such as the number of Gössers drunk, the times underground, etc.
General Treasury Responsibilities
@@ -362,8 +252,10 @@Expo files
+ +Archive all the accounts on the Expo online systems in expofiles/accounts and keep scanned copies of the Bier Book and Sesh Book in expofiles/writeups/ You'll need several Expo Committee meetings. Firstly to plan what should be done, and later to check that all the jobs are being done. If someone just isn't pulling their weight or has too much else to do, the committee meetings should be used to provide encouragement (!) and/or redistribute the workload. I suppose one of the jobs of the Expo Leader is to check that everything is going to plan, be he/she won't always think of everything on their own. See the checklists in the appendices. You'll need several Expo Committee meetings. Firstly to plan what should be done, and later to check that all the jobs are being done. If someone just isn't pulling their weight or has too much else to do, the committee meetings should be used to provide encouragement (!) and/or redistribute the workload. I suppose one of the jobs of the Expo Leader is to check that everything is going to plan, be he/she won't always think of everything on their own. See the checklists in the expo planning guide Remember that all the Expo committee are volunteers (more or less of their own volition :-), but they may have different priorities and/or different reasons for participating than yourself. This can make committee work interesting or taxing, depending on your viewpoint, but try to keep Expo as an adventure rather than a chore; it's worth it in the end. This document was written to describe how the CUCC Expo is financed. It is primarily a guide for first-time Expo Treasurers, though part 1 may also be of use to any Expo Treasurer. Part 1 described the principle of the Expo finances: the sources of income and expenditure and the principles behind the Expo billing system. Part 2 described the role of the treasurer and details on the practical side of being Expo Treasurer. Being Expo Treasurer will involve quite a lot of work. Remember the need to be open and fair. Good Luck! Top.Committees...
@@ -385,24 +277,25 @@
Conclusions
+Summary
-
+
+
+
-
-
Expo laptops
-The expo laptop 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. +
The expo laptop 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.
Using WebDAV
This no longer works as we had to change the folder permissions for /uploads/. Sorry. diff --git a/handbook/uploading.html b/handbook/uploading.html index 9bb23aebe..5c2f98225 100644 --- a/handbook/uploading.html +++ b/handbook/uploading.html @@ -117,7 +117,7 @@ and then click on the "Connect" button at the bottom of the sub-window.
(Click to enlarge). -
For installing and pre-configuring Filezilla on a new machine see FileZilla install instructions which will set you up pointing at the correct folder automatically. But none of this will work on new machine until you have also done the key exchange procedure.
+
For installing and pre-configuring Filezilla on a new machine see FileZilla install instructions which will set you up pointing at the correct folder automatically. But none of this will work on new machine until you have also done the key-pair setup procedure.
Automated magic
Note that uploading photos does not automatically update the view @@ -131,7 +131,7 @@ at http://expo.survex.com/photos/ i
Using your own laptop
To use your own laptop on expo, or after you return from expo, you need need to use FTP. So become an experienced user first. -
You will need to know the expo password but none of this will work until you have also done the key exchange procedure.
+You will need to know the expo password but none of this will work until you have also done the key-pair setup procedure.
To install and configure Filezilla on your machine see FileZilla install instructions which will set you up pointing at the correct folder automatically.
@@ -154,7 +154,7 @@ at http://expo.survex.com/photos/ i