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. if you can't get your own laptop or phone to work with the printer.
<h3>The Expo Laptop's Friend: Aziraphale</h3> <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> <h3>Networking Hardware - experts only</h3>
@ -83,7 +84,7 @@ above the sink/stove area and connected via a usb cable to the Acer netbook. The
<p>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 . <p>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 .
<p>The <em>Expo laptop</em> has a dynamic local address of this form. <p>The <em>Expo laptop</em> has a dynamic local address of this form.
It has a 64GB microSD card plugged into it which holds the local copy of /expofiles/ . It has a 64GB microSD card plugged into it which holds the local copy of /expofiles/ .
<p>The Acer Aspire netbook ("tclaspire3") is ona static address <a href="http://192.168.1.100/">192.168.1.100</a>. <p>The Acer Aspire netbook ("tclaspire3") is on a static address <a href="http://192.168.1.100/">192.168.1.100</a>.
<p>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 <p>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 192.168.2.x etc. The antenna is now on the first-floor balcony within
sight of the tatty hut window. sight of the tatty hut window.

View File

@ -6,29 +6,101 @@
<link rel="stylesheet" type="text/css" href="../../css/main2.css" /> <link rel="stylesheet" type="text/css" href="../../css/main2.css" />
</head> </head>
<body><style>body { background: #fff url(/images/style/bg-system.png) repeat-x 0 0 }</style> <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> <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. <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 <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>.
<br />MySQL database
<br />cgit <h3 id="what">Server configuration: software</a></h3>
<br />boe
<br />cron <ul>
<br />Makefile <li>apache webserver
<br />bins <li>MySQL database
<br />expofiles <li>cgit (live webpage showing git status of repos)
<br />ssh <li>Makefile
<li>bins
<li>expofiles
<li>ssh
<li>cron
<li>xapian (search function)
<li>boe
</ul>
<p>[2020-04-10] <em>To be written...</em> <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 /> <hr />
Go on to: Go on to:
<a href="trogintro.html">troggle introduction</a><br /> <a href="trogintro.html">troggle introduction</a><li>
Return to: 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 /> <hr />
</body> </body>
</html> </html>