From 61c5d3f47898166d9f3fc2b64881f63d98a570f2 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Mon, 4 May 2020 00:49:40 +0100 Subject: [PATCH] server config additions --- handbook/computer.html | 5 +- handbook/troggle/serverconfig.html | 100 +++++++++++++++++++++++++---- 2 files changed, 89 insertions(+), 16 deletions(-) diff --git a/handbook/computer.html b/handbook/computer.html index e786731b1..38277b4f2 100644 --- a/handbook/computer.html +++ b/handbook/computer.html @@ -70,7 +70,8 @@ directly but we haven't got this configured properly yet.) Use a usb stick to tr if you can't get your own laptop or phone to work with the printer.

The Expo Laptop's Friend: Aziraphale

-

In 2019 we have another general-use laptop. This is not connected by any cabling and just uses WiFi. Like the expo laptop it is running debian Linux and has the same set of software installed (survex/aven, tunnelx, therion, tortoisehg, git etc.) and you login to it using the username "expo" and the usual cavey:beery password. It is a 14-inch Thinkpad on loan from Michael Sargent and it is called "aziraphale". The expo laptop is just called "debian". +

In 2019 we had another general-use laptop. This is not connected by any cabling and just uses WiFi. Like the expo laptop it is running debian Linux and has the same set of software installed + (survex/aven, tunnelx, therion, git etc.) and you login to it using the username "expo" and the usual cavey:beery password. It is a 14-inch Thinkpad on loan from Michael Sargent and it is called "aziraphale". The expo laptop is just called "debian".

Networking Hardware - experts only

@@ -83,7 +84,7 @@ above the sink/stove area and connected via a usb cable to the Acer netbook. The

The potato hut WiFi is running DHCP and allocating IP addresses of the form 192.168.1.x where x is a number between 11 and 99 .

The Expo laptop has a dynamic local address of this form. It has a 64GB microSD card plugged into it which holds the local copy of /expofiles/ . -

The Acer Aspire netbook ("tclaspire3") is ona static address 192.168.1.100. +

The Acer Aspire netbook ("tclaspire3") is on a static address 192.168.1.100.

The Gasthof WiFi - which you can still use - is "StaudnGast" and has no WiFi password but there is a login webpage (Gast/Gastin21). It allocates IP addresses in the range 192.168.2.x etc. The antenna is now on the first-floor balcony within sight of the tatty hut window. diff --git a/handbook/troggle/serverconfig.html b/handbook/troggle/serverconfig.html index 8eae6df79..8a8650bdf 100644 --- a/handbook/troggle/serverconfig.html +++ b/handbook/troggle/serverconfig.html @@ -6,29 +6,101 @@ -

CUCC Expedition Handbook

+

CUCC Expedition Handbook: Server

The Expo server

Troggle is the software which runs the the expo cave survey data management and website. It is not the only thing running on the expo server. -

Server configuration

+

Server configuration: directory structure

+

This is the folder structure of the repo :expoweb: which is also the root +of the website. Note that the webserver (apache) presents many more apparent folders, such as expofiles, than there are folders because that's what it and troggle do. +

In the list below only the handbook folder has been expanded. The years folder includes +42 subfolders from 1976 to 2019. + -
apache webserver -
MySQL database -
cgit -
boe -
cron -
Makefile -
bins -
expofiles -
ssh +

The handbook illustrates the i/t/l idiom whereby an image file (i) is displayed with a paragraph of text as an HTML file (l) and there is a thumbnail image (t) which is included in another document, e.g. see the photographic guide to the walk from the toll road car park. + +

Server configuration: software

+ + -

[2020-04-10] To be written... +

[2020-05-03] To be written... + +

cron

+

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 launched at the appropriate times by +the server root from /etc/crontab. + +

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

boe

+

This is a perl script, and server by the webserver using the configuraiotn +

+#bank of expo
+#current expedition
+ScriptAlias /boe /home/expo/boe/boc/boc.pl
+
+        AddHandler cgi-script .pl
+        SetHandler cgi-script
+        Options +ExecCGI
+        Require all granted
+
+ in ~expo/config/apache/expo.conf.
Go on to: -troggle introduction
+troggle introduction
  • Return to: -expo online systems overview
    +expo online systems overview