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

De-tortoising the handbook

Browse Source
This commit is contained in:
Philip Sargent 2020-04-24 21:20:40 +01:00
parent 5a3cd2099c
commit 31ffca841b
7 changed files with 19 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/main2.css
View File

@ -459,6 +459,13 @@ ul.errorlist {
color: red
}
/* added 2020-04-24 by Philip Sargent */
var { # to match <code> but inline when documenting systems
font-family: monospace;
font-size: 0.9em;
#font-style: normal;
background-color: #eee;
}
/*Narrow screens support*/
/*Added 2019-02-22 by Radost Waszkiewicz

2
handbook/computing/basiclaptop.html
View File

@ -16,7 +16,7 @@
<ol>
<li>Register an SSH key</a> with an expo nerd i.e 'get a login'. (see "Key Configuration" below)</li>
<li>Install <a href="#software">git version control software</a> to download ("clone"), view and edit caving data.</li>
<li>Clone three <a href="manual.html#repositories">expo repositories</a> so you have the files on your machine.</li>
<li>Clone three <a href="manual.html#repositories">expo repositories</a> <var>loser, drawings</var> and <var>expoweb</var> so you have the files on your machine. (Use the <a href="qstart-git.html">git reminder</a> for how to do this, e.g. <em>git clone ssh://expo@expo.survex.com:/home/expo/expoweb</em></li>
<li>Install survex, and therion or tunnel for editing cave data.
</ol>

10
handbook/computing/keyexchange.html
View File

@ -80,12 +80,10 @@ Be <b>extremely careful</b> to type ">>" and not ">" in the fourth line below ot
<br /><font color=blue">expo@expo:~$</font> cd .ssh
<br /><font color=blue">expo@expo:~$</font> cp -p authorized_keys authorized_keys.backup
<br /><font color=blue">expo@expo:~/.ssh$</font> cat keys/id_rsa.pub >>authorized_keys
<br /><font color=blue">expo@expo:~/.ssh$</font> ./list-keys.sh
<br /><font color=blue">expo@expo:~/.ssh$</font> cat list-of-key-owners
<br /><font color=blue">expo@expo:~/.ssh$</font> tail -n 1 authorized_keys
</tt>
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:<br />
<span style="font-family:monospace; size=x-small; background-color: lightgray">anathema.device@crowley</span>
<li>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.
This adds your key on to the end of the authorized keys list and prints the last line - which should be your key that you just added.
<li>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: <em>ssh expo@expo.survex.com </em>.
</p>
<p>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.
@ -93,7 +91,7 @@ This adds your key on to the end of the authorized keys list, runs a little scri
</ol>
<hr />
Return to <a href="basiclaptop.html">Setting up a basic laptop</a>
<div id="menu">
<ul id="links">
<li><a href="../index.htm">Handbook</a>

BIN
handbook/tortoise/expoRepositoryScreen.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 165 KiB

BIN
handbook/tortoise/expoRepositoryScreen2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 211 KiB

BIN
handbook/tortoise/expoWorkbenchopen.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.3 KiB

64
handbook/tortoise/tortoise-win.htm
View File

@ -2,18 +2,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Cambridge University Caving Club Expedition Handbook.</title>
<title>Expo Handbook - PuTTY</title>
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<body>
<h1>Windows: TortoiseHg and PuTTy</h1>
<p> THIS ARTICLE TO BE SPLIT - PuTTy STUFF VALID BUT Hg SHORTLY TO BE OBSOLETE</p?
<p>Struggling to get TortoiseHg to work on Windows (v10)? Here’s a quick guide which I hope explains how to sort it all
out.</p>
<h1>Windows: PuTTy</h1>
<p>First you need to set up <a href="../computing/keyexchange.html">keys</a> so that you can use ssh.
Until you can do that there is no point in doing anything else. This is <i>particularly difficult</i>
@ -21,8 +16,7 @@ on Windows which requires <a href="https://rperki.blogspot.com/2015/06/install-p
Allow an afternoon at least to get this bit to work as it is poorly documented.
To get the keys set up on the server you will have to wait for an already-authenticated nerd to do it for you so this is not a quick job.
<p>First download and install both <a href="http://tortoisehg.bitbucket.io/">TortoiseHg</a>
and <a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html">PuTTy</a>. Then run PuTTy;</p>
<p>First download and install <a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html">PuTTy</a>. Then run PuTTy;</p>
<h2>PuTTy:</h2>
<p>Upon opening PuTTy, you’ll be greeted with a screen similar to this;</p>
@ -44,56 +38,12 @@ this is what’s supposed to happen; so just type in the password and press the
you to verify the address you're attempting to log into (at which
point you select 'hells-to-the-yeah', or equivalent).
<p>You have now made sure that your computer will be happy to log on using TortoiseHg.
<p>You have now made sure that your computer will be happy to log on to the server once you have the keys set up (be sure to use the Windows instructions for this, not the Linux of Windows WSL instructions).
To log out of PuTTy, type 'logout', then press the return/enter key.</p>
<p><b>Note that when connecting in the potato hut in Austria</b>, you now use exactly the same procedure.
<h2>TortoiseHg:</h2>
<p>To open up TortoiseHg, simply open a folder somewhere on your desktop (you can make a new folder if you want, to keep things neat), and right click in the folder and select “Hg Workbench”</p>
<div style="text-align: center">
<img src="expoWorkbenchopen.png" alt="Accessing the Workbench" />
<p class="caption">Accessing the Hg Workbench</p></div>
<p>Once this opens up, go to File>Clone Repository, and you should get the following;</p>
<div style="text-align: center">
<img src="expoRepositoryScreen.png" width="75%" height="50%" alt="Hg Workbench" />
<p class="caption">Hg Workbench</p></div>
<p>At which point type <tt>ssh://expo@expo.survex.com/repositories/hg/loser</tt> into
the 'Source' box (in this case I have specified a particular folder on
the server; 'loser', I suggest you do the same for now). You may also
choose where you want the repository to be created by clicking
'Browse' next to the 'Destination' box. As far as I recall, you don't
need to edit anything in the box where it says 'Hg command'. Click 'Clone'!</p>
<p>Voila! If you're now looking at the following screen or similar,</p>
<div style="text-align: center">
<img src="expoRepositoryScreen2.png" width="75%" height="50%" alt="Hg Workbench Linked" />
<p class="caption">Hg Workbench Linked</p></div>
<p>That will have cloned the /loser/ repository to your laptop.
<p>
If you want to update the handbook or other parts of the website you will also need to clone the /expoweb/ repository.
You can scan what's in the repositories (read only) using your web browser:
<ul>
<li><a href="/hgrepositories/home/expo/loser/graph/">loser</a> - the survex cave survey data (hg)</li>
<li><a href="/repositories/drawings/.git/log">drawings</a> - the tunnel and therion cave data and drawings (git)</li>
<li><a href="/repositories/expoweb/.git/log">expoweb</a> - the website pages, handbook, generation scripts (hg)</li>
<li><a href="/repositories/troggle/.git/log">troggle</a> - the database/software part of the survey data management system - see <a href="../troggle/trogintro.html">notes on troggle</a> for further explanation (git)</li>
</ul>>
<p>If anything seems unclear, please email me at elmo2058@gmail.com, and I will reinstall things
on my own machine to see where things get confusing.
</p>
<h2>pagegent</h2>
<p> <em>pagegent</em> is installed along with PuTTy and is what you need to keep your Windows machine talking nicely to the expo server. See <a href="https://rperki.blogspot.com/2015/06/install-puttypageant-on-win-10.html">pagengt config</a> for how to do this.
<p>Now return to the <a href="../computing/keyexchange.html">key-pair setup instructions</a> for how to configure the keys using PuTTy.
<hr />
</body>