laptops docum corrections

This commit is contained in:
Philip Sargent 2022-12-10 14:23:08 +00:00
parent e94c5c8101
commit e31194648b
5 changed files with 14 additions and 7 deletions

View File

@ -19,6 +19,11 @@
<p>The nerd needs to login to the expo server using <em>their own userid</em>, not the 'expo' userid. The nerd also needs to be in the group that is allowed to do 'sudo'.
<h4>Ideal situation</h4>
<p>Ideally this would all be done on a stand-alone laptop to get the bugs in the logbook parsing sorted out before we upload the corrected file to the server. Unfortunately this requires a full troggle software development laptop as the parser is built into troggle. The <var>expo laptop</var> in the potato hut is not set up to do this (yet - 2022).
<p>However, the <var>expo laptop</var> (or any 'bulk update' laptop) is configured to allow an authorized user to log in to the server itself and to run the import process directly on the server.
<h4>Current situation</h4>
<p>The nerd needs to do this:
<ol>
<li>Look at the list of pre-existing old import errors at <a href="/dataissues">Data Issues</a> </br>

View File

@ -27,6 +27,8 @@ expo.survex.com:
<li><a href="/repositories/expoweb/.git/"><var>:expoweb:</var></a> - the website pages, handbook, generation scripts (git)</li>
<li><a href="/repositories/troggle/.git/"><var>:troggle:</var></a> - the database/software part of the survey data management system<br> - see <a href="../troggle/trogintro.html">notes on troggle</a> for further explanations </li>
</ul>
<p>If you want to use your own laptop to interact directly with the repos then a basic laptop or a survey laptop is not enough: you need an
<a href="bulkupdatelaptop.html">expo bulk update laptop</a>.
<p>From the command line, to clone a repo, you will do this
<tt>git clone ssh://expo@expo.survex.com/home/expo/loser</tt>
@ -69,8 +71,8 @@ cave data surveying tasks.
<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 do sophisticated management of their cave survey data (i.e. not just simple
uploads) will 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">basic laptop setup</a>.
uploads) will 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 a basic laptop or a survey laptop is not enough: you need a
<a href="bulkupdatelaptop.html">bulk update laptop</a>.
<hr />

View File

@ -84,12 +84,12 @@ Just separate the paragraphs with &lt;P&gt; codes and it will work. (You don't n
<em>Technical Note:</em> The information in the cave registration form is saved to the server as a file, which is
committed to the version control system automatically, as
well as being registered in the online database used by the website publication software. If you are a nerd with a
<a href="../computing/basiclaptop.html#basic"><var>basic expo laptop</var></a>, you can edit the file directly.
<a href="../computing/bulkupdatelaptop.html#basic"><var>bulk update laptop</var></a>, you can edit the file directly.
For Fischgesicht (originally 2017-CUCC-28 and now 1623/290), this is in the
<var>:expoweb:</var> repo, in <var>/cave_data/1623-290.html</var>, but you will have to manage the git commit process yourself.
<p>Fischgesicht currently (pre-2022 expo) has 25 survex files (listed <a href="/survexfile/2017-cucc-28">here</a>
now, or <a href="/survexfile/caves-1623/290/290.svx">here</a> in future). You could do a useful job by
<p>Fischgesicht currently (pre-2023 expo) has 25 survex files (listed as <a href="/survexfile/2017-cucc-28">2017-cucc-28</a>, <a href="/survexfile/290">290</a>
or <a href="/survexfile/caves-1623/290/290.svx">290 survexfile</a> ). You could do a useful job by
checking all those survex files to see if the cave description in them has already been copied into the cave registration form
"Underground description" text box.

View File

@ -103,7 +103,7 @@ tell a nerd on expo that it is there. Or, if you are confident with Filezilla, c
<p>If you draw up the topo after expo is over, then email them to a nerd who will upload them into the right place.
<p>If you have your own machine configured as a <a href="../computing/basiclaptop.html#basic">expo basic laptop</a> then you can use
<p>If you have your own machine configured as a <a href="../computing/bulkupdatelaptop.html">expo bulk update laptop</a> then you can use
<a href="../computing/fzconfig.html">Filezilla</a> to upload the topo files directly to the server.
<h3>This may be a change from how you used to do it</h3>

View File

@ -15,7 +15,7 @@
<p>This is the folder structure of the repo <var>:expoweb:</var> which is also the root
of the website. Note that the webserver (apache) presents many more apparent folders, such as <var>expofiles</var>, than there are folders because that's what it and troggle do.
<p>In the list below only the <var>handbook</var> folder has been expanded. The <var>years</var> folder includes
42 subfolders from <var>1976</var> to <var>2019</var>.
42 subfolders from <var>1976</var> to <var>2022</var>.
<code><textarea id="folders" rows="30" cols="30">
expoweb (repo)
&boxvr;&HorizontalLine;&HorizontalLine; 1623