More cleaning - all difficult website stuff now in one place

This commit is contained in:
2018-06-28 21:42:26 +01:00
parent 7954cc754e
commit 0d3399dfd3
3 changed files with 33 additions and 16 deletions

View File

@@ -3,6 +3,7 @@
<title>CUCC Expedition Handbook: Expo computer</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Expo server in Potato Hut</h1>
The expo server runs the tatty hut music system and is a core node of the survey data version control system.

View File

@@ -1,18 +1,21 @@
<html>
<head>
<title>CUCC Expedition Handbook: Configuring Filezilla</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>CUCC Expedition Handbook: Uploading files/photos</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Configuring Filezilla to upload photos etc.</h1>
coming soon..
UNDER REVISION
[[This will have a configuration file to download and use..]]
<p>
but it's easy, just connect to ftp://expo.survex.com and type in the usual password when a popup asks you. Go to the folder /expofiles/uploads and dump your stuff there. Then ask someone who knows to move it to the right place.
<h2>More expert use</h2>
Instead of putting everything in /expofiles/uploads/ why not do it properly? Go back to the "Uploading Photos" page and find out.
<hr />
Back to <a href="uploading.html">Uploading instructions</a> using Filezilla.
</body>
</html>

View File

@@ -1,4 +1,3 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -7,13 +6,22 @@
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Uploading photos, GPS tracks and files</h1>
<h1>Uploading photos and GPS tracks</h1>
<h2>Simple instructions</h2>
<ol>
<li>Use the Expo laptop in the tatty hut. Get someone to show you how to do it.
</ol>
<p>That's it. There used to be other ways of doing it using browser extensions but these either don't work anymore [since 2017] or the instructions to install them properly have become too complicated.
<p>Beginners should always put all their files into the folder <b>/home/expo/expofiles/uploads/</b> and ask an admin to move them to the right place.
<p>Now go to <a href="#init">using Filezilla initially</a> - still using the Expo laptop.
<h2>More complex instructions</h2>
<p>Using your own laptop on expo, or after you return from expo:
<ol>
<li>Download and install <b>Filezilla</b>.
</ol>
<p>That's it. There used to be other ways of doing it using browser extensions but these either don't work anymore or the instructions to install them properly have become too complicated.
<p>You do need to know the expo password.</p>
<h3>Installing Filezilla</h3>
@@ -25,21 +33,24 @@
<li>Now configure it to connect to the expo server using the instructions <a href="fzconfig.html">on this expo handbook page</a>
</ul>
<h2>Using Filezilla initially</h2>
<h2 id="init">Using Filezilla initially</h2>
<p>The expo website has a big section under 'home/expo/expofiles/' that is <b>not under version control</b>. This is dangerous as there is no backup. If you overwrite some important files with your holiday snaps then we are in big trouble. This is where we store big files that we don't want to keep multiple versions of.
<p>So beginners should always put all their files into the folder /home/expo/expofiles/uploads/ and ask an admin to move them to the right place. To make his or her life easier, create your own folder in /expofiles/uploads/ with your name like this: /home/expo/expofiles/uploads/ClarkKent/ and put your files into that folder.
<p>So beginners should always put all their files into the folder
<pre>/home/expo/expofiles/uploads/</pre> and ask an admin to move them to the right place. The configuration which you just did (if you followed <a href="fzconfig.html">the instructions</a>) will set you up pointing at the correct folder automatically.
<p>
To make the admin's life easier, create your own folder in <pre>/home/expo/expofiles/uploads/</pre> with your name like this: <pre>/home/expo/expofiles/uploads/YourName/</pre> and put your files into that folder. ("YourName" should have no spaces, hyphens or underline characters.) So that the admin knpows who is responsible. And for goodness sake please don't upload lots of duplicate photos: cull them first to just the good ones.
<h2>Experienced users</h2>
<p>OK the person you have been asking to move the files is getting fed up and now wants you to put the uploaded photos in the right place yourself. This is where they go:
<p>OK the person you have been asking to move the files to the right place is getting fed up and now wants you to put the uploaded photos in the right place yourself. This is where they go:
<pre>
directory: /home/expo/expofiles/photos/2018/YourName/
directory: /home/expo/expofiles/<b>photos</b>/2018/YourName/
</pre>
Or for GPS tracks, do
<pre>
directory: /home/expo/expofiles/gpslogs/2018/YourName/
directory: /home/expo/expofiles/<b>gpslogs</b>/2018/YourName/
</pre>
<p>Obviously replace 'YourName' with your actual name (no spaces!). It is important that you get this right as this specific way of writing your name is standardised across the website. Use the year that the photo was taken or the GPStrack logged.</p>
@@ -58,18 +69,20 @@ mac and android with other tools. If you have Windows 10 and <a href="https://ms
<a href="http://winscp.net/eng/index.php">http://winscp.net/eng/</a>.</p>
<p>quick start guide:
http://winscp.net/eng/docs/getting_started</p>
<a href="http://winscp.net/eng/docs/getting_started">http://winscp.net/eng/docs/getting_started</a></p>
<p>screenshots:
http://winscp.net/eng/docs/screenshots</p>
<a href="http://winscp.net/eng/docs/screenshots">http://winscp.net/eng/docs/screenshots</a></p>
<h3>Using WebDAV - cadaver</h3>
<p>Command-line people can use the 'cadaver' client which is even
available for windows too:
http://www.phtagr.org/2009/04/01/cadaver-for-windows/</p>
<a href="http://www.phtagr.org/2009/04/01/cadaver-for-windows/">www.phtagr.org/2009/04/01/cadaver-for-windows/</a></p>
<p>They both give you an 'explorer-like' interface (although winscp can
<p>Both scp and cadaver give you an 'explorer-like' interface (although winscp can
give you a norton-commander-style 2-pane UI as well).</p>
<h3>Using rsync</h3>
<p>No, don't use rsync for this. Really don't. It's too liable to delete everything.
<hr />
</body>
</html>