diff --git a/handbook/computing/ftpusage.html b/handbook/computing/ftpusage.html deleted file mode 100644 index 66e5d2b55..000000000 --- a/handbook/computing/ftpusage.html +++ /dev/null @@ -1,72 +0,0 @@ - - - -CUCC Expedition Handbook: Uploading files - - - -

CUCC Expedition Handbook - FTP on Android phone

- -

Using expo server via FTP or scp or sftp connection

- -

Configure connection on Android phone

-

SFTP only works if you have key-pair setup set up. But -you can use FTP using this app and this method. - -

-
-

Configure connection on Windows

-

scp only works if you have key-pair setup set up. - -

-
- - - -

Configure connection on Linux/Unix

-

scp only works if you have key-pair setup set up. -

- - - diff --git a/handbook/fzconfig.html b/handbook/computing/fzconfig.html similarity index 69% rename from handbook/fzconfig.html rename to handbook/computing/fzconfig.html index e7ee9f5b3..bed90722c 100644 --- a/handbook/fzconfig.html +++ b/handbook/computing/fzconfig.html @@ -38,7 +38,23 @@ click on the "File" menu item and select "Site Manager...". This will display a tree-structured menu in a sub-window and one of the items will be "Expo-uploads". Highlight it and then click on the "Connect" button at the bottom of the sub-window. -
  • You will now be prompted for the password for the expo server. This is the "cavey:beery" one which we never write down or write in emails. Get it verbally or by phone or secure text message from another expoer. +
  • Now you may have a problem on a Windows machine. Even though you have set up the key-exchange process, it may not be working: + +
  • You may now be prompted for the password for the expo server. This is the "cavey:beery" one which we never write down or write in emails. Get it verbally or by phone or secure text message from another expoer. If the key-exchange process is working you won't need the password.
  • Now check that these Filezilla settings are set correctly:

    Now you are in and can copy and move files anywhere. But please stick to copying files from your machine (the left window) to the server (the right window) into the /uploads/, /photos/ or /gpslogs/ folders only:

    -
    (Click to enlarge). +
    (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-pair setup 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 @@ -133,7 +133,7 @@ at http://expo.survex.com/photos/ i

    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. +

    To install and configure Filezilla on your machine see FileZilla install instructions which will set you up pointing at the correct folder automatically.

    Getting photo files from phones