mirror of
https://expo.survex.com/repositories/expoweb/.git/
synced 2024-11-22 07:11:55 +00:00
Handbook updates
This commit is contained in:
Philip Sargent
parent
32e9db4a2c
commit
1c0c2ebb3f
11
1623/README.txt
Normal file
11
1623/README.txt
Normal file
@ -0,0 +1,11 @@
|
||||
Programmers beware.
|
||||
|
||||
Troggle generates files in repsonse to URL requests of the form
|
||||
/1623/283.html
|
||||
but there is also this real folder /1623/ in the expoweb root
|
||||
which contains HTML files and fragments which are served as-is
|
||||
as plain HTML.
|
||||
|
||||
This is very bad design of course, and a relic, but an awful lot of
|
||||
files will need fixing to reapir this peculiarity.
|
||||
Philip Sargent 26/2/2022
|
||||
@ -10,7 +10,7 @@
|
||||
<body>
|
||||
<h1>Loser plateau - the walk-in</h1>
|
||||
|
||||
<p>From the <a href="../handbook/tollrd.htm">Loser Panoramastraße</a>
|
||||
<p>From the <a href="../handbook/tollrd.html">Loser Panoramastraße</a>
|
||||
Bergrestaurant car park, take the path leading from the NE corner, which is
|
||||
slightly shorter, and soon joins the main path (numbered 201, and marked with
|
||||
red and white paint at frequent intervals).</p>
|
||||
@ -21,11 +21,11 @@ width="223" height="123" alt="View from Loser towards the plateau" /></a>
|
||||
width="155" height="86" alt="Tony Rooke on path 201" /></a></div>
|
||||
|
||||
<p>Following this gently undulating path for ten to fifteen minutes leads to
|
||||
<a href="../noinfo/areapage_skeletons/egglgrub.html">Egglgrube</a>. Ahead and to the right is a 10m
|
||||
<a href="../egglgrub.html">Egglgrube</a>. Ahead and to the right is a 10m
|
||||
cliff rising from the pasture to an area of karren and dwarf pine. To the
|
||||
left is a valley containing several obvious sinkholes, with a junction path
|
||||
signposted "Bräuning Zinken" (Weg Nr. 257) leading to <a
|
||||
href="../noinfo/areapage_skeletons/br-alm.html">Bräuning Alm.</a></p>
|
||||
href="../br-alm.html">Bräuning Alm.</a></p>
|
||||
|
||||
<table class="imgtable">
|
||||
<tr><td><a href="../piclinks/2012nd.htm"><img src="../tinypix/2012nd.jpg" width="163"
|
||||
@ -54,7 +54,7 @@ src="t/tc1977.jpg" width="158" height="108" alt="" /></a></td></tr><tr
|
||||
class="caption"><td colspan="2">Bräuning Alm</td></tr></table>
|
||||
|
||||
<p>Above this scarp is another flat area of pasture, the site of CUCC's <a
|
||||
href="../handbook/tcamps.htm#id1977camp">advance camp</a> of 1977. The path also climbs
|
||||
href="../handbook/tcamps.html#id1977camp">advance camp</a> of 1977. The path also climbs
|
||||
this scarp a little further on, turning right (not very obvious) out of the
|
||||
continuing main valley. If the valley is followed up (this was our normal
|
||||
route in 1976 and 1977), the same destination can eventually be reached by a
|
||||
@ -69,12 +69,12 @@ height="112" alt="" /></a></td></tr>
|
||||
<tr class="caption"><td colspan="2">Schwarzmoossattel approach</td></tr></table>
|
||||
|
||||
<p>The main path leads to short climbs up and breaks out onto a ridge between
|
||||
the above-mentioned valley and the much deeper <a href="../noinfo/areapage_skeletons/kratzer.html">
|
||||
the above-mentioned valley and the much deeper <a href="../kratzer.html">
|
||||
Kratzer valley,</a> access to which is difficult at this point owing to steep
|
||||
limestone scars. Continuing, the path converges with the 1976 route coming in
|
||||
from the left at a small col, then contours below the small peak of
|
||||
Bräuning Nase to the left. Ahead is the site of CUCC's <a
|
||||
href="../handbook/tcamps.htm#id1979camp">bivouac of 1979</a>, and, slightly beyond, the
|
||||
href="../handbook/tcamps.html#id1979camp">bivouac of 1979</a>, and, slightly beyond, the
|
||||
broad col of Schwarzmoossattel.</p>
|
||||
|
||||
<p><a href="../plateau.html">The plateau</a> lies directly ahead over this col, and may be reached by any
|
||||
@ -86,7 +86,7 @@ the Steinbrücken top camp bivvy. Every year we repair the cairns and
|
||||
place reflectors on them just for the period that expo is running.</p>
|
||||
|
||||
<p>Following the path round to the left (WNW) soon leads to a big cairn and
|
||||
a short scramble down to the old <a href="../handbook/tcamps.htm#topcamp">Top Camp</a>, which
|
||||
a short scramble down to the old <a href="../handbook/tcamps.html#topcamp">Top Camp</a>, which
|
||||
has been used by CUCC between 1988 and 2000. This is adjacent to the only reliable
|
||||
water supply we have found, situated below the dramatic Bräuning wall.
|
||||
Please take care not to pollute the spring! Note that this camp site is
|
||||
@ -94,7 +94,7 @@ still within the area designated as a "Naturschutzgebiet" (Nature
|
||||
Reserve) and permission is required to camp there.</p>
|
||||
|
||||
<p>The path continues below the Bräuning wall to the west, eventually to
|
||||
reach the inaccessible pasture of <a href="../noinfo/areapage_skeletons/gschwand.html"> Gschwandt
|
||||
reach the inaccessible pasture of <a href="../gschwand.html"> Gschwandt
|
||||
Alm</a> north of Loser.</p>
|
||||
|
||||
<p>Turning right off the path shortly before old top camp cairned
|
||||
|
||||
@ -25,18 +25,8 @@ The split mechanism transparently underlies everything, but for user-friendlines
|
||||
<p>Source and docs for the upstream version are online at <a href="https://github.com/malc0/BoC">https://github.com/malc0/BoC</a> which has a link to a demonstration system that you can play with (CUCC meets 2014-15).</p>
|
||||
|
||||
<hr />
|
||||
|
||||
<ul id="links">
|
||||
<li><a href="index.htm">Expedition Handbook</a>
|
||||
<ul>
|
||||
<li><a href="survey/index.htm">Surveying guide</a> - Overview</li>
|
||||
<li><a href="look4.htm">Prospecting guide</a> – Overview</li>
|
||||
<li><a href="rescue.htm">Rescue guide</a></li>
|
||||
<li><a href="rig/rigit.html">Rigging guide</a></li>
|
||||
<li><a href="photo.htm">Photography guide</a></li>
|
||||
</ul></li>
|
||||
<li><a href="../infodx.htm">Index to info/topics pages</a></li>
|
||||
|
||||
</ul>
|
||||
Go back to <a href="treasurer.html">Expo Treasurer Role</a><br>
|
||||
Go on to <a href="bierbook.html">The Bier and Sesh books</a>
|
||||
<hr />
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -8,7 +8,8 @@
|
||||
<body>
|
||||
<h1>Expo Planning Guide</h1>
|
||||
<dl>
|
||||
<dt><a href="../years/2018/index.html">Running this year's expo (2018)</a></dt>
|
||||
<dt><a href="../years/2022/index.html">Running this year's expo (2022)</a></dt>
|
||||
<dt><a href="../years/2018/index.html">How we ran expo (2018)</a></dt>
|
||||
<dd>Example of how to do it. </dd>
|
||||
|
||||
<dt><a href="leader.htm">Checklist for expo leaders</a></dt>
|
||||
@ -33,6 +34,12 @@
|
||||
|
||||
</ul>
|
||||
|
||||
<dt>Communications</dt>
|
||||
<ul>
|
||||
<li>Kanban job ticket system, either <a href="https://trello.com/b/WddB62HI/expo-jobs">Trello</a> for 2022, or <a href="/kanboard"><var>/kanboard</var></a> for later expos</li>
|
||||
<li>Live & archived chat: <a href="https://app.element.io/#/room/!wTGfwrwfiRMsZvzGZW:matrix.org">Matrix chat</a> from 2022, or
|
||||
<a href="https://app.slack.com/client/TQF95LK8T/CQUJSN8P9/thread/CQUM4L3HD-1579458900.001800">Slack</a> as used for the aborted 2020 and 2021 expos, but with archived useful discussions</li>
|
||||
</ul>
|
||||
|
||||
<dt>Planning who does what</dt>
|
||||
<dd>Read the expo leader checklist (above). Consult the planning lists from previous expos:</dd>
|
||||
|
||||
@ -58,44 +58,24 @@ expoweb (repo)
|
||||
<p>
|
||||
See the live report on which urls resolve to which actual folders at <a href="/pathsreport">pathsreport</a>.
|
||||
|
||||
<h4 id="js">Javascript</a></h4>
|
||||
There are javascript packages installed directly on the operating system on the server, i.e. in<br>
|
||||
<code>/usr/share/javascript</code>
|
||||
which are used by some <var>expoweb</var> pages:
|
||||
<ul>
|
||||
<li><var>CaveScript</var> for showing 3D views of cave centreline data,
|
||||
<li><var>CodeMirror</var> for syntax-colouring survex files
|
||||
<li><var>openlayers</var> for geographic mapping integration, for out slippy map showing paths and entrances at <a href="/map/map.html">/map/map.html</a>
|
||||
<li><var>leaflets</var> and experimental mapping test (only on /map/index-leaflet.html )
|
||||
</ul>
|
||||
These javascript packages are not documented but some are mentioned in <a href="troglaptop.html">the soft dev laptop</a> configuration.
|
||||
|
||||
<p>Currently installed on the server (October 2021) are the following javascript packages which are <em>not used at all by troggle or any of the expo website</em>:
|
||||
<ul>
|
||||
<li>jquery
|
||||
<li>jquery-ui
|
||||
<li>mootools
|
||||
<li>sphinxdoc
|
||||
<li>underscore
|
||||
</ul>
|
||||
<p>Presumably these are used by something else hosted on the server ? Anyway, if you are setting up a new troggle sever you don't need them.
|
||||
|
||||
<h3 id="what">Server configuration: software</a></h3>
|
||||
|
||||
<ul>
|
||||
<li>apache webserver *
|
||||
<li>expofiles *
|
||||
<li>MySQL/MariaDB database *
|
||||
<li>packaged javascript
|
||||
<li>cgit (live webpage showing git status of repos) - <a href="https://git.zx2c4.com/cgit/about/">qit.zx2c4.com/cgit</a>
|
||||
<li>Makefile (obsolete?)
|
||||
<li><b>apache webserver *</b>
|
||||
<li><b>expofiles *</b>
|
||||
<li><b>MySQL/MariaDB database *</b>
|
||||
<li><a href="#xapian">xapian</a> (search function) - <a href="https://xapian.org/">xapian.org</a>. Wookey did this in 2020.
|
||||
<li><a href="#kanboard">kanboard</a> (task planning) - <a href="https://kanboard.org/">kanboard.org</a>. Wookey did this in 2022.
|
||||
<li><a href="#boe">boe</a> (bank of expo - not troggle)
|
||||
<li><a href="#cgit">cgit</a> (live webpage showing git status of repos) - <a href="https://git.zx2c4.com/cgit/about/">qit.zx2c4.com/cgit</a>
|
||||
<li>bins (used to regenerate the photo albums)
|
||||
<li>packaged javascript
|
||||
<li>cron
|
||||
<li>xapian (search function) - <a href="https://xapian.org/">xapian.org</a>. Wookey did this in 2020.
|
||||
|
||||
<li>boe (bank of expo - not troggle)
|
||||
<li>Makefile (obsolete?)
|
||||
<li><a href="#runserver">Running a test Troggle server</a>
|
||||
</ul>
|
||||
* These are essential to make troggle work at all.
|
||||
<b> * These are essential</b> to make troggle work at all.
|
||||
|
||||
<p>The server configuration scripts are in the file <var>troggle/debian/serversetup</var> and are also
|
||||
documented with notes in <var>troggle/README.txt</var>. It is intended that the full documentation will
|
||||
@ -373,20 +353,71 @@ expofiles
|
||||
├── 2019
|
||||
└── 2021</textarea></code>
|
||||
|
||||
<h3>cron</h3>
|
||||
<h3 id="js">Javascript</a></h3>
|
||||
There are javascript packages installed directly on the operating system on the server, i.e. in<br>
|
||||
<code>/usr/share/javascript</code>
|
||||
which are used by some <var>expoweb</var> pages:
|
||||
<ul>
|
||||
<li><var>CaveScript</var> for showing 3D views of cave centreline data,
|
||||
<li><var>CodeMirror</var> for syntax-colouring survex files
|
||||
<li><var>openlayers</var> for geographic mapping integration, for out slippy map showing paths and entrances at <a href="/map/map.html">/map/map.html</a>
|
||||
<li><var>leaflets</var> and experimental mapping test (only on /map/index-leaflet.html )
|
||||
</ul>
|
||||
These javascript packages are not documented but some are mentioned in <a href="troglaptop.html">the soft dev laptop</a> configuration.
|
||||
|
||||
<p>Currently installed on the server (October 2021) are the following javascript packages which are <em>not used at all by troggle or any of the expo website</em>:
|
||||
<ul>
|
||||
<li>jquery
|
||||
<li>jquery-ui
|
||||
<li>mootools
|
||||
<li>sphinxdoc
|
||||
<li>underscore
|
||||
</ul>
|
||||
<p>Presumably these are used by something else hosted on the server ? Anyway, if you are setting up a new troggle sever you don't need them.
|
||||
|
||||
|
||||
|
||||
|
||||
<h3 id="xapian">Search: xapian</h3>
|
||||
<p>Installed independently of troggle simply with <var>apt install xapian-omega</var> and
|
||||
then configured into the troggle-generated menus in <var>css/main2.css</var>.
|
||||
You can see it at the bottom of the top-left menu on this page and on nearly all pages of the handbook.
|
||||
The function is
|
||||
connected with an apache configuration
|
||||
<code>ScriptAlias /search /usr/lib/cgi-bin/omega/omega</code> in <var>~expo/config/apache/expo.conf</var>.
|
||||
Installed by Wookey in May 2020.
|
||||
|
||||
<h3 id="kanboard">Planning: kanboard</h3>
|
||||
<p>This is installed on the server and accessed at <a href="/kanboard"><var>/kanboard</var></a> It is an open source
|
||||
equivalent of the Trello kanban card task planning system. The 2022 expo uses
|
||||
<a href="https://trello.com/b/WddB62HI/expo-jobs">Trello itself</a> (separate login required) but we intend to move to our own kanboard
|
||||
from 2023.
|
||||
|
||||
<h3 id="boe">boe</h3>
|
||||
<p>This is a perl script, and served by the webserver using the url apache configuration<pre><code>#bank of expo
|
||||
#current expedition
|
||||
ScriptAlias /boe /home/expo/boe/boc/boc.pl
|
||||
<Directory /home/expo/boe/boc>
|
||||
AddHandler cgi-script .pl
|
||||
SetHandler cgi-script
|
||||
Options +ExecCGI
|
||||
Require all granted
|
||||
</Directory></code></pre> in <var>~expo/config/apache/expo.conf</var>.
|
||||
<p>Handbook documentation for its use is at <a href="../bankofexpo.html">The Bank of Expo</a>.
|
||||
|
||||
<h3 id="cgit">cgit - web interface to server git repos</h3>
|
||||
<p>This is a compiled executable written in C which, like boe, is installed as an Apache CGI redirection.
|
||||
The installation instructions are at <a href="https://git.zx2c4.com/cgit/tree/README">https://git.zx2c4.com/cgit/tree/README</a>
|
||||
but we use the Debian package <a href="https://packages.debian.org/stable/cgit">https://packages.debian.org/stable/cgit</a>.
|
||||
|
||||
<h3>cron - automatically run tasks to schedule</h3>
|
||||
<p>This is currently disabled in Feb. 2022. If you need anything that would be done frequently (e.g. bins) you currently have to run it manually.
|
||||
<p>The server runs it's hourly, daily and weekly scripts using the anacron system. In
|
||||
<var>~expo/config/cron/</var> on the server, there are <var>expo.hourly</var>
|
||||
and <var>expo.daily</var> scripts and these are (or should be) launched at the appropriate times by
|
||||
the server root from <var>/etc/crontab</var>. This is not obviously working on the server at present.
|
||||
|
||||
<h3>Search: xapian</h3>
|
||||
<p>Installed independently of troggle simply with <var>apt install xapian-omega</var> and
|
||||
then configured into the troggle-generated menus in <var>css/main2.css</var>. The function is
|
||||
connected with an apache configuration
|
||||
<code>ScriptAlias /search /usr/lib/cgi-bin/omega/omega</code> in <var>~expo/config/apache/expo.conf</var>.
|
||||
Installed by Wookey in May 2020.
|
||||
|
||||
<h3>Running a test Troggle server</h3>
|
||||
<h3 id="runserver">Running a test Troggle server</h3>
|
||||
<p>
|
||||
For high volume use, Troggle should be run using a web server like apache.
|
||||
However, a quick way to get started is to use the development server built into Django.
|
||||
@ -405,16 +436,6 @@ gunicorn also works. This runs with 9 workers (suitable for a 4-core processor,
|
||||
$ gunicorn --reload -w 9 -b :8000 wsgi
|
||||
</code>
|
||||
|
||||
<h3>boe</h3>
|
||||
<p>This is a perl script, and served by the webserver using the url apache configuration<code><pre>#bank of expo
|
||||
#current expedition
|
||||
ScriptAlias /boe /home/expo/boe/boc/boc.pl
|
||||
<Directory /home/expo/boe/boc>
|
||||
AddHandler cgi-script .pl
|
||||
SetHandler cgi-script
|
||||
Options +ExecCGI
|
||||
Require all granted
|
||||
</Directory></pre></code> in <var>~expo/config/apache/expo.conf</var>.
|
||||
|
||||
<hr />
|
||||
Return to: <a href="trogdesign.html">Troggle design and future implementations</a><br />
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
|
||||
<head>
|
||||
<!-- Do not edit this file! It is auto-generated. Edit the template file noinfo/areapage_skeletons/remote.html instead. -->
|
||||
<!-- This file used to be auto-generated by a perl script
|
||||
from the template file noinfo/areapage_skeletons/remote.html
|
||||
but now this is all just static HTML -->
|
||||
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<title>1623: remote area</title>
|
||||
@ -84,7 +86,7 @@ BS17 Organhöhle, whose description is included here and which CUCC revisted
|
||||
|
||||
<tr><td align="right"><a id="idla40">LA40</a></td><td><a href="1623/la40.htm">LUSS/LA40</a></td></tr>
|
||||
|
||||
<tr><td align="right"><a id="idbs17">BS17</a></td><td><a href="1623/bs17.htm">Organhöhle</a></td></tr>
|
||||
<tr><td align="right"><a id="idbs17">283 (BS17)</a></td><td><a href="/1623/283.html">Organhöhle</a></td></tr>
|
||||
|
||||
</table>
|
||||
<destination dest="remote.html" />
|
||||
|
||||
18
years/2018/.picasaoriginals/.picasa.ini
Normal file
18
years/2018/.picasaoriginals/.picasa.ini
Normal file
@ -0,0 +1,18 @@
|
||||
[logbook1.jpg]
|
||||
rotate=rotate(2)
|
||||
moddate=3574cae48e29d801
|
||||
width=1771
|
||||
height=632
|
||||
textactive=0
|
||||
[mr-rig-x.jpg]
|
||||
rotate=rotate(3)
|
||||
moddate=33b2dbe48e29d801
|
||||
width=1759
|
||||
height=1241
|
||||
textactive=0
|
||||
[solarcarry.jpg]
|
||||
filters=enhance=1;autolight=1;fill=1,0.757009;
|
||||
moddate=a1f8e8e48e29d801
|
||||
width=800
|
||||
height=600
|
||||
textactive=0
|
||||
BIN
years/2018/.picasaoriginals/logbook1.jpg
Normal file
BIN
years/2018/.picasaoriginals/logbook1.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 200 KiB |
BIN
years/2018/.picasaoriginals/mr-rig-x.jpg
Normal file
BIN
years/2018/.picasaoriginals/mr-rig-x.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 530 KiB |
BIN
years/2018/.picasaoriginals/solarcarry.jpg
Normal file
BIN
years/2018/.picasaoriginals/solarcarry.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 114 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 200 KiB After Width: | Height: | Size: 203 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 530 KiB After Width: | Height: | Size: 519 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 126 KiB |
@ -36,16 +36,12 @@ On expo website:
|
||||
<li><a href="../../../expofiles/surveyscans/2019/">2019 surveying progress</a></li>
|
||||
<li><a href="../2018/topcamplist.html">Stuff left at top camp 2018</a></li>
|
||||
<li><a href="../2018/basecamplist.html">Stuff left at base camp 2018</a></li>
|
||||
<li><a href="../2018/ugcamplist.html">Stuff left at Littleboy camp 2018</a></li>
|
||||
<li><a href="../2019/topcamplist.html">Stuff left at top camp 2019</a></li>
|
||||
<li><a href="../2019/basecamplist.html">Stuff left at base camp 2019</a></li>
|
||||
<li><a href="../2019/ugcamplist.html">Stuff left at Littleboy camp 2019 - cleaned out?</a></li>
|
||||
<li><a href="../2017/organcamp.html">Stuff left at Organhohle camp 2017</a> and not collected in 2019</li>
|
||||
<li><a href="../2018/ugcamplist.html">Stuff left at Littleboy camp 2018</a> (removed in 2019?)</li>
|
||||
<li><a href="../2019/topcamplist.html">Stuff left at top camp 2019</a> (Missing)</li>
|
||||
<li><a href="../2019/basecamplist.html">Stuff left at base camp 2019</a> (Missing)</li>
|
||||
|
||||
<li><a href="../2017/organcamp.html">Stuff left at Organhohle camp 2017</a> and not collected in 2019 ?</li>
|
||||
|
||||
<span style="color: gray">
|
||||
<li>Gear order for 2022
|
||||
<li><a href="stuffbought2022.html">Things bought 2022
|
||||
</span>
|
||||
<li><a href="https://ukcaving.com/board/">Pre-Expo Training Blog</a> on ukcaving.com (Fix to new URL)
|
||||
<li><a href="../../handbook/geartape.html">Geartape colours</a> to be updated as members commit to come
|
||||
</ul>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user