diff --git a/1623/README.txt b/1623/README.txt new file mode 100644 index 000000000..fb11ee34c --- /dev/null +++ b/1623/README.txt @@ -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 \ No newline at end of file diff --git a/1623/walkin.htm b/1623/walkin.htm index a15a00054..efc5b1b39 100644 --- a/1623/walkin.htm +++ b/1623/walkin.htm @@ -10,7 +10,7 @@

Loser plateau - the walk-in

-

From the Loser Panoramastraße +

From the Loser Panoramastraße 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).

@@ -21,11 +21,11 @@ width="223" height="123" alt="View from Loser towards the plateau" />  width="155" height="86" alt="Tony Rooke on path 201" />

Following this gently undulating path for ten to fifteen minutes leads to -Egglgrube. Ahead and to the right is a 10m +Egglgrube. 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 Bräuning Alm.

+href="../br-alm.html">Bräuning Alm.

Bräuning Alm

Above this scarp is another flat area of pasture, the site of CUCC's advance camp of 1977. The path also climbs +href="../handbook/tcamps.html#id1977camp">advance camp 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="" /> Schwarzmoossattel approach

The main path leads to short climbs up and breaks out onto a ridge between -the above-mentioned valley and the much deeper +the above-mentioned valley and the much deeper Kratzer valley, 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 bivouac of 1979, and, slightly beyond, the +href="../handbook/tcamps.html#id1979camp">bivouac of 1979, and, slightly beyond, the broad col of Schwarzmoossattel.

The plateau 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.

Following the path round to the left (WNW) soon leads to a big cairn and -a short scramble down to the old Top Camp, which +a short scramble down to the old Top Camp, 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.

The path continues below the Bräuning wall to the west, eventually to -reach the inaccessible pasture of Gschwandt +reach the inaccessible pasture of Gschwandt Alm north of Loser.

Turning right off the path shortly before old top camp cairned diff --git a/handbook/bankofexpo.html b/handbook/bankofexpo.html index f1b0098c1..d1cfa9b19 100644 --- a/handbook/bankofexpo.html +++ b/handbook/bankofexpo.html @@ -25,18 +25,8 @@ The split mechanism transparently underlies everything, but for user-friendlines

Source and docs for the upstream version are online at https://github.com/malc0/BoC which has a link to a demonstration system that you can play with (CUCC meets 2014-15).


- - +Go back to Expo Treasurer Role
+Go on to The Bier and Sesh books +
diff --git a/handbook/planning.html b/handbook/planning.html index 56040d8f9..14e083400 100644 --- a/handbook/planning.html +++ b/handbook/planning.html @@ -8,7 +8,8 @@

Expo Planning Guide

-
Running this year's expo (2018)
+
Running this year's expo (2022)
+
How we ran expo (2018)
Example of how to do it.
Checklist for expo leaders
@@ -33,6 +34,12 @@ +
Communications
+
Planning who does what
Read the expo leader checklist (above). Consult the planning lists from previous expos:
diff --git a/handbook/troggle/serverconfig.html b/handbook/troggle/serverconfig.html index 736876b8a..2a4d69291 100644 --- a/handbook/troggle/serverconfig.html +++ b/handbook/troggle/serverconfig.html @@ -58,44 +58,24 @@ expoweb (repo)

See the live report on which urls resolve to which actual folders at pathsreport. -

Javascript

-There are javascript packages installed directly on the operating system on the server, i.e. in
-/usr/share/javascript - which are used by some expoweb pages: - - These javascript packages are not documented but some are mentioned in the soft dev laptop configuration. - -

Currently installed on the server (October 2021) are the following javascript packages which are not used at all by troggle or any of the expo website: -

-

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

Server configuration: software

- * These are essential to make troggle work at all. + * These are essential to make troggle work at all.

The server configuration scripts are in the file troggle/debian/serversetup and are also documented with notes in troggle/README.txt. It is intended that the full documentation will @@ -373,20 +353,71 @@ expofiles ├── 2019 └── 2021 -

cron

+

Javascript

+There are javascript packages installed directly on the operating system on the server, i.e. in
+/usr/share/javascript + which are used by some expoweb pages: + + These javascript packages are not documented but some are mentioned in the soft dev laptop configuration. + +

Currently installed on the server (October 2021) are the following javascript packages which are not used at all by troggle or any of the expo website: +

+

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

Search: xapian

+

Installed independently of troggle simply with apt install xapian-omega and +then configured into the troggle-generated menus in css/main2.css. +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 +ScriptAlias /search /usr/lib/cgi-bin/omega/omega in ~expo/config/apache/expo.conf. +Installed by Wookey in May 2020. + +

Planning: kanboard

+

This is installed on the server and accessed at /kanboard It is an open source +equivalent of the Trello kanban card task planning system. The 2022 expo uses +Trello itself (separate login required) but we intend to move to our own kanboard +from 2023. + +

boe

+

This is a perl script, and served by the webserver using the url apache configuration

#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>
in ~expo/config/apache/expo.conf. +

Handbook documentation for its use is at The Bank of Expo. + +

cgit - web interface to server git repos

+

This is a compiled executable written in C which, like boe, is installed as an Apache CGI redirection. +The installation instructions are at https://git.zx2c4.com/cgit/tree/README +but we use the Debian package https://packages.debian.org/stable/cgit. + +

cron - automatically run tasks to schedule

+

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.

The server runs it's hourly, daily and weekly scripts using the anacron system. In ~expo/config/cron/ on the server, there are expo.hourly and expo.daily scripts and these are (or should be) launched at the appropriate times by the server root from /etc/crontab. This is not obviously working on the server at present. -

Search: xapian

-

Installed independently of troggle simply with apt install xapian-omega and -then configured into the troggle-generated menus in css/main2.css. The function is -connected with an apache configuration -ScriptAlias /search /usr/lib/cgi-bin/omega/omega in ~expo/config/apache/expo.conf. -Installed by Wookey in May 2020. - -

Running a test Troggle server

+

Running a test Troggle server

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 -

boe

-

This is a perl script, and served by the webserver using the url apache configuration

#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>
in ~expo/config/apache/expo.conf.
Return to: Troggle design and future implementations
diff --git a/remote.html b/remote.html index 312d0a3e9..1baeccce1 100644 --- a/remote.html +++ b/remote.html @@ -1,7 +1,9 @@ - + 1623: remote area @@ -84,7 +86,7 @@ BS17 Organhöhle, whose description is included here and which CUCC revisted LA40LUSS/LA40 -BS17Organhöhle +283 (BS17)Organhöhle diff --git a/years/2018/.picasaoriginals/.picasa.ini b/years/2018/.picasaoriginals/.picasa.ini new file mode 100644 index 000000000..0bb48d58c --- /dev/null +++ b/years/2018/.picasaoriginals/.picasa.ini @@ -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 diff --git a/years/2018/.picasaoriginals/logbook1.jpg b/years/2018/.picasaoriginals/logbook1.jpg new file mode 100644 index 000000000..691ff9b94 Binary files /dev/null and b/years/2018/.picasaoriginals/logbook1.jpg differ diff --git a/years/2018/.picasaoriginals/mr-rig-x.jpg b/years/2018/.picasaoriginals/mr-rig-x.jpg new file mode 100644 index 000000000..728b5196a Binary files /dev/null and b/years/2018/.picasaoriginals/mr-rig-x.jpg differ diff --git a/years/2018/.picasaoriginals/solarcarry.jpg b/years/2018/.picasaoriginals/solarcarry.jpg new file mode 100644 index 000000000..7c0856a4c Binary files /dev/null and b/years/2018/.picasaoriginals/solarcarry.jpg differ diff --git a/years/2018/logbook1.jpg b/years/2018/logbook1.jpg index 691ff9b94..8f316d776 100755 Binary files a/years/2018/logbook1.jpg and b/years/2018/logbook1.jpg differ diff --git a/years/2018/mr-rig-x.jpg b/years/2018/mr-rig-x.jpg index 728b5196a..a1fdcc730 100755 Binary files a/years/2018/mr-rig-x.jpg and b/years/2018/mr-rig-x.jpg differ diff --git a/years/2018/solarcarry.jpg b/years/2018/solarcarry.jpg index 7c0856a4c..eddcbe4bf 100755 Binary files a/years/2018/solarcarry.jpg and b/years/2018/solarcarry.jpg differ diff --git a/years/2022/index.html b/years/2022/index.html index 0f9eb6c92..f9f8b476c 100644 --- a/years/2022/index.html +++ b/years/2022/index.html @@ -36,16 +36,12 @@ On expo website:
  • 2019 surveying progress
  • Stuff left at top camp 2018
  • Stuff left at base camp 2018
  • -
  • Stuff left at Littleboy camp 2018
  • -
  • Stuff left at top camp 2019
  • -
  • Stuff left at base camp 2019
  • -
  • Stuff left at Littleboy camp 2019 - cleaned out?
  • -
  • Stuff left at Organhohle camp 2017 and not collected in 2019
  • +
  • Stuff left at Littleboy camp 2018 (removed in 2019?)
  • +
  • Stuff left at top camp 2019 (Missing)
  • +
  • Stuff left at base camp 2019 (Missing)
  • + +
  • Stuff left at Organhohle camp 2017 and not collected in 2019 ?
  • - -
  • Gear order for 2022 -
  • Things bought 2022 -
  • Pre-Expo Training Blog on ukcaving.com (Fix to new URL)
  • Geartape colours to be updated as members commit to come