From ecfa95310ded7dde2f81ab89730373fcd128e931 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Sat, 14 Mar 2020 20:08:44 +0000
Subject: [PATCH] Documenting installation
---
README.txt | 10 ++++++++++
localsettingsserver.py | 16 ++++++----------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/README.txt b/README.txt
index 57f5b6a..978f6a1 100644
--- a/README.txt
+++ b/README.txt
@@ -39,6 +39,10 @@ If you want to work on the source code and be able to commit, your account will
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.
+Setting up survex
+-----------------
+You need to have survex installed as the command line 'cavern' is used as part of the survex
+import process.
Setting up tables and importing legacy data
------------------------------------------
@@ -68,6 +72,12 @@ on the expo server.
At least these need setting:
DocumentRoot /home/expo/expoweb
WSGIScriptAlias / /home/expo/troggle/wsgi.py
+<Directory /home/expo/troggle>
+ <Files wsgi.py>
+ Require all granted
+ </Files>
+</Directory>
+
Alias /expofiles /home/expo/expofiles
Alias /photos /home/expo/webphotos
Alias /map /home/expo/expoweb/map
diff --git a/localsettingsserver.py b/localsettingsserver.py
index 259974e..354b397 100644
--- a/localsettingsserver.py
+++ b/localsettingsserver.py
@@ -62,16 +62,12 @@ TEMPLATE_DIRS = (
# Don't forget to use absolute paths, not relative paths.
)
-LOGFILE = '/home/expo/troggle/troggle_log.txt'
+LOGFILE = '/home/expo/troggle/troggle.log'
FEINCMS_ADMIN_MEDIA='/site_media/feincms/'
-EMAIL_HOST = "smtp.gmail.com"
-
-EMAIL_HOST_USER = "cuccexpo@gmail.com"
-
-EMAIL_HOST_PASSWORD = "khvtffkhvtff"
-
-EMAIL_PORT=587
-
-EMAIL_USE_TLS = True
+#EMAIL_HOST = "smtp.gmail.com"
+#EMAIL_HOST_USER = "cuccexpo@gmail.com"
+#EMAIL_HOST_PASSWORD = "khvtffkhvtff"
+#EMAIL_PORT=587
+#EMAIL_USE_TLS = True