server config additions

This commit is contained in:
Philip Sargent 2020-05-04 00:49:40 +01:00
parent 297c0fad02
commit 61c5d3f478
2 changed files with 89 additions and 16 deletions

View File

@ -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.
<h3>The Expo Laptop's Friend: Aziraphale</h3>
<p>In 2019 we have another general-use laptop. This is not connected by any cabling and just uses WiFi. Like the <i>expo laptop</i> 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 <i>expo laptop</i> is just called "debian".
<p>In 2019 we had another general-use laptop. This is not connected by any cabling and just uses WiFi. Like the <i>expo laptop</i> 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 <i>expo laptop</i> is just called "debian".
<h3>Networking Hardware - experts only</h3>

View File

@ -6,29 +6,101 @@
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head>
<body><style>body { background: #fff url(/images/style/bg-system.png) repeat-x 0 0 }</style>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h2 id="tophead">CUCC Expedition Handbook: Server</h2>
<h1>The Expo server</h1>
<p>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.
<h3 id="what">Server configuration</a></h3>
<h3 id="what">Server configuration: directory structure</a></h3>
<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>.
<code><textarea id="folders" rows="30" cols="30">
.
├── 1623
├── 1626
├── cave_data
├── css
├── documents
├── entrance_data
├── folk
├── gallery
├── handbook
│   ├── computing
│   ├── festering
│   ├── i
│   ├── l
│   ├── putty
│   ├── rig
│   ├── survey
│   ├── t
│   └── troggle
├── images
├── map
├── maps
├── noinfo
├── others
├── pending
├── photos
├── piclinks
├── scripts
├── signup
├── templates
├── tinypix
├── topos
└── years</textarea></code>
<br />apache webserver
<br />MySQL database
<br />cgit
<br />boe
<br />cron
<br />Makefile
<br />bins
<br />expofiles
<br />ssh
<p>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 <a href="../../1623/walkin.htm">the photographic guide to the walk from the toll road car park</a>.
<p>[2020-04-10] <em>To be written...</em>
<h3 id="what">Server configuration: software</a></h3>
<ul>
<li>apache webserver
<li>MySQL database
<li>cgit (live webpage showing git status of repos)
<li>Makefile
<li>bins
<li>expofiles
<li>ssh
<li>cron
<li>xapian (search function)
<li>boe
</ul>
<p>[2020-05-03] <em>To be written...</em>
<h3>cron</h3>
<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 launched at the appropriate times by
the server root from <var>/etc/crontab</var>.
<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>boe</h3>
<p>This is a perl script, and server by the webserver using the configuraiotn
<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 />
Go on to:
<a href="trogintro.html">troggle introduction</a><br />
<a href="trogintro.html">troggle introduction</a><li>
Return to:
<a href="../computing/onlinesystems.html">expo online systems overview</a><br />
<a href="../computing/onlinesystems.html">expo online systems overview</a><li>
<hr />
</body>
</html>