diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2019-07-09 10:41:21 +0100 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2019-07-09 10:41:21 +0100 |
| commit | d6053322e8e2e0b05a2dba92fd954c37b9b4ca6e (patch) | |
| tree | 84fe9d3beee2837d6a2a9a881740faeb8acf8882 | |
| parent | 9266e5460e745ea0b36dcfd2d050c24a1d21f2cf (diff) | |
| parent | 5b5f385b67400730eb94419b9854d7d87e57a78a (diff) | |
| download | troggle-d6053322e8e2e0b05a2dba92fd954c37b9b4ca6e.tar.gz troggle-d6053322e8e2e0b05a2dba92fd954c37b9b4ca6e.tar.bz2 troggle-d6053322e8e2e0b05a2dba92fd954c37b9b4ca6e.zip | |
Merge branch 'master' of ssh://expo.survex.com/~/troggle
| -rw-r--r-- | README.txt | 8 | ||||
| -rw-r--r-- | localsettingsdocker.py | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -1,6 +1,6 @@ Troggle is an application for caving expedition data management, originally created for use on Cambridge University Caving Club (CUCC)expeditions and licensed under the GNU Lesser General Public License. -Troggle has been forked into two projects. The original one is maintained by Aron Curtis and is used for Erebus caves. The CUCC variant uses files as the definitive data, not the database and lives at expo.sruvex.com/troggle. +Troggle has been forked into two projects. The original one is maintained by Aron Curtis and is used for Erebus caves. The CUCC variant uses files as the definitive data, not the database and lives at expo.survex.com/troggle. Troggle setup ========== @@ -18,12 +18,12 @@ If you want to use MySQL or Postgresql, download and install them. However, you Troggle itself ------------- -Choose a directory where you will keep troggle, and svn check out Troggle into it using the following command: +Choose a directory where you will keep troggle, and git clone Troggle into it using the following command: -svn co http://troggle.googlecode.com/svn/ +git clone git://expo.survex.com/troggle -If you want to work on the source code and be able to commit, you will need to use https instead of http, and your google account will need to be added to the troggle project members list. Contact aaron dot curtis at cantab dot net to get this set up. +If you want to work on the source code and be able to commit, your account will need to be added to the troggle project members list. Contact wookey at wookware dot org to get this set up. Next, you need to fill in your local settings. Copy either localsettingsubuntu.py or localsettingsserver.py to a new file called localsettings.py. Follow the instructions contained in the file to fill out your settings. diff --git a/localsettingsdocker.py b/localsettingsdocker.py index 331d23e..aa7e7a9 100644 --- a/localsettingsdocker.py +++ b/localsettingsdocker.py @@ -1,5 +1,5 @@ import sys -# link localsettings to this file for use on expo computer in austria +# This is the local settings for use with the docker compose dev setup. It is imported automatically DATABASES = { 'default': { |