expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-22 07:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pageant docm. and reminder to use expo@ user

Browse Source
This commit is contained in:
Philip Sargent 2020-06-02 01:00:24 +01:00
parent 6c77d10400
commit 91fc44a486
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
handbook/computing/qstart-git.html
View File

@ -19,6 +19,10 @@ have <a href="keyexchange.html">key-pair setup</a> already set up before any of
- check that you can get ssh working before trying to run git too</font>
<p>If you can get to the <i>expo laptop</i> try these commands on that first as the key exchange has already been done. If the key exchnage has not been done then none of this will work.
<p>You can read or clone these repos without any control, but to write ("push") to them you will need to use <var>ssh://expo@expo.survex.com</var> and set up the <a href="keyexchange.html">key exchange</a>.
<p>NOTE: always use user <var>'expo'</var> as the login user (<var>ssh://expo@...</var>) even though within git you will be identified by your own ssh key name.
<p> Open a terminal in a new directory, e.g. /tmp/experiments/ in which you want to create the repo. It will automatically create a folder with the repo name e.g.'troggle' in that directory.
<dl>
@ -58,7 +62,7 @@ class="onright" src="git-arrows31.png" alt="git bread & butter commands subset"
<h3><a id="gitwindows">Using git in Windows</a></h3>
<p>Do not use the official "git for Windows" client software as it doesn't understand symlinks in the WSL filesystem we use on Windows. Use VS Code which understand WSL or a command line git in a WSL terminal window.
<p>Do not use the official "git for Windows" client software as it doesn't understand symlinks in the WSL filesystem (which is what we use on Windows). Use VS Code which understands WSL or a command line git in a WSL terminal window.
<p>"Git is a 4 handle, dual boiler espresso machine – when all you need is instant."
<p>Once you've downloaded and installed a git client, the first step is to create what is called a checkout of the data management system. This creates a copy on your machine which you can edit to your heart's content. The command to initially check out ('clone') the entire expo data management system is:</p>
@ -74,9 +78,13 @@ class="onright" src="git-arrows31.png" alt="git bread & butter commands subset"
<p><code>git commit</code> (you can specify filenames to be specific)</p>
<h3><a id="pageant">Windows key gotcha</a></h3>
<p>The first time you do this on a Windows machine it will probably not work as it does not recognise the server key exchange.
Fix this by running putty (downloading it from <a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">https://www.chiark.greenend.org.uk/~sgtatham/putty/</a>), and connecting to the server 'expo@expo.survex.com' (on port 22). Confirm that this is the right server.
If you succeed in getting a shell prompt then ssh connection are working and git should be able to clone the repo, and send changes back.</p>
<img class="onleft" src="pageant-icon.jpg">
<p>For more detailed instructions on making Pageant work see <a href="fzconfig.html">the section in the middle of the Filezilla instructions</a> where it describes how to configure Pageant.
<hr />

3
handbook/computing/repos.html
View File

@ -36,7 +36,8 @@ expo.survex.com:
<h3>Uploading cave survey data</a></h3>
<p>You can read or clone these repos without any control, but to write ("push") to them you will need to use <varssh://</var> and set up the <a href="keyexchange.html">key exchange</a>.
<p>You can read or clone these repos without any control, but to write ("push") to them you will need to use <var>ssh://expo@expo.survex.com</var> and set up the <a href="keyexchange.html">key exchange</a>.
<p>NOTE: when using git to path to a repository, always use user <var>'expo'</var> as the login user (<var>ssh://expo@...</var>) even though within git you will be identified by your own ssh key name. This is because file permissions on the server require this.
<p>So cavers wanting to upload their cave survey data have to use a machine on which they key is already set up. The <i>expo laptop</i> lives in the potato hut during expo and it is sometimes joined by the laptop '<i>aziraphale</i>'. These are both loaned machines running Linux. If you want to use your own laptop then
see the <a href="basiclaptop.html">minimal laptop setup</a>.