add link to all expedition pages back to expoweb /year/ page

This commit is contained in:
Philip Sargent 2021-04-16 01:56:43 +01:00
parent 540ce7c076
commit 9695e49024
3 changed files with 20 additions and 2 deletions

View File

@ -241,6 +241,25 @@ $ sudo systemctl restart mysql.service
$ sudo systemctl stop mysql.service
$ sudo systemctl start mysql.service
While logged in at a terminal session as expo on expo.survex.,com
$ mysql -h localhost -u expo -p<password>
will get you the MariasDb command prompt: https://www.hostwinds.com/guide/how-to-use-mysql-mariadb-from-command-line/
then:
>drop database troggle;
>create database troggle;
>quit
Somewhere I have notes for the GRANT PRIVS type runes...
Ah yes:
CREATE DATABASE troggle;
GRANT ALL PRIVILEGES ON troggle.* TO 'expo'@'localhost' IDENTIFIED BY 'somepassword'; FLUSH PRIVILEGES; (at mysql root prompt)
(explained on https://chartio.com/resources/tutorials/how-to-grant-all-privileges-on-a-database-in-mysql/)
(but you need to create the database too)
Running a Troggle server
------------------------
For high volume use, Troggle should be run using a web server like apache.

View File

@ -19,7 +19,7 @@
{% endifequal %}
{% endfor %}
</p>
<p>See also the <a href="/years/{{expedition.year}}/">documentation index</a> for this Expo
<p>Reparse and reload this year's logbook by clicking here: <a href="/expedition/{{expedition.year}}?reload">RELOAD</a>
<p><b>At a single glance:</b> The table shows all expo cavers and their recorded trips.

View File

@ -75,7 +75,6 @@ trogglepatterns = [
# url(r'^person/(?P<person_id>\d*)/?$', logbooks.person),
url(r'^person/(?P<first_name>[A-Z]*[a-z\-\'&;]*)[^a-zA-Z]*(?P<last_name>[a-z\-\']*[^a-zA-Z]*[A-Z]*[a-z\-&;]*)/?', logbooks.person, name="person"),
# url(r'^person/(\w+_\w+)$', logbooks.person, name="person"),
# url(r'^personform/(.*)$', personForm),
url(r'^expedition/(\d+)$', logbooks.expedition, name="expedition"),
url(r'^api/expeditions_tsv$', logbooks.Expeditions_tsvListView.as_view()),