rearranged config files

README.txt

@@ -1,4 +1,4 @@
-Updated 10 April 2021
+Updated 3 May 2021
 
 Troggle is an application for caving expedition data management, 
 originally created for use on Cambridge University Caving Club (CUCC)expeditions 
@@ -46,14 +46,13 @@ Key-exchange instructions: http://expo.survex.com/handbook/computing/keyexchange
 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 localsettingsWSL.py 
+Next, you need to fill in your local settings. Copy _deploy/WSL/localsettingsWSL.py 
 to a new file called localsettings.py and edit it and settings.py to match
 your machine's file locations. 
 Follow the instructions contained in the file to fill out your settings.
 
-{ *TO BE FIXED*
-  The localsettings-expo-live.py is the python2.7 settings for the server.
-  These are all very out of date and need fixing:
+{ in _deploy/old/ we have these which are all very out of date:
+  localsettings-expo-live.py is the python2.7 settings for the server.
   localsettingsubuntu.py
   localsettingsdocker.py
   localsettingswindows.py
@@ -62,7 +61,6 @@ Follow the instructions contained in the file to fill out your settings.
 
 Python3, Django, and Database setup
 -----------------------------------
-First version of troggle using python3 required Django 1.8.19 (16 June 2019)
 We are now using Django 2.2.19 
 
 Read this: https://docs.djangoproject.com/en/3.0/topics/install/

settings.py

@@ -139,8 +139,9 @@ INSTALLED_APPS = (
 )
 
 # See the recommended order of these in https://docs.djangoproject.com/en/2.2/ref/middleware/
-# Note that tis is a radically different onion architecture though it looks the same, 
+# Note that this is a radically different onion architecture from earlier versions though it looks the same, 
 # see https://docs.djangoproject.com/en/2.0/topics/http/middleware/#upgrading-pre-django-1-10-style-middleware 
+# Seriously, read this: https://www.webforefront.com/django/middlewaredjango.html which is MUCH BETTER than the docs
 MIDDLEWARE = [
     #'django.middleware.security.SecurityMiddleware', # SECURE_SSL_REDIRECT and SECURE_SSL_HOST # we don't use this
     'django.middleware.gzip.GZipMiddleware', # not needed when expofiles and photos served by apache

wookey-exposerver-recipe.txt

@@ -1,84 +0,0 @@
-adduser expo
-apt install openssh-server mosh tmux mc zile emacs-nox mc most ncdu
-apt install python-django apache2 mysql-server survex make rsync 
-apt install libjs-openlayers make 
-apt install git mercurial mercurial-server?
-
-for boe:
-apt install libcgi-session-perl libcrypt-passwdmd5-perl libfile-slurp-perl libgit-wrapper-perl libhtml-template-perl libhtml-template-pro-perl libmime-lite-perl libtext-password-pronounceable-perl libtime-parsedate-perl libuuid-tiny-perl libcrypt-cracklib-perl
-
-apt install ufraw for PEF image decoding.
-sudo apt install python-django python-django-registration e fonts-freefont-ttf libapache2-mod-wsgi python3-gdbm
-# sudo apt install python-django-imagekit python-django-tinymc
-
-obsolete-packages: bins (move to jigl?)
-  older python-django?
-backports: survex therion
-not-packaged: caveview
-
-
-make these dirs available at top documentroot:
-cuccfiles
-expofiles
-loser
-tunneldata
-troggle
-expoweb
-boc/boe
-
-config
-containing:
-
-setup apache configs for cucc and expo
-#disable default website
-a2dissite 000-default
-a2ensite cucc
-a2ensite expo
-a2enmod cgid
-
-
-Boe config:
-Alias /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>
-And remember to set both program and data dir to be
-www-data:www-data
-(optionally make file group read/write by treasurer account)
-create empty repo by clicking create in boe interface
-then set names in 'settings'
-
-Set up mysql (as root)
-mysql -p
-CREATE DATABASE troggle;
-GRANT ALL PRIVILEGES ON troggle.* TO 'expo'@'localhost' IDENTIFIED BY 'somepassword';  
-
-install django:
-sudo apt install python-django python-django-registration python-django-imagekit python-django-tinymce fonts-freefont-ttf libapache2-mod-wsgi
-
-python-django-imagekit comes from https://salsa.debian.org/python-team/modules/python-django-imagekit
-python-django-tinymce comes from https://salsa.debian.org/python-team/modules/python-django-tinymce
-
-need fonts-freefont-ttf (to have truetype freesans available for troggle via PIL)
-need libapache2-mod-wsgi for apache wsgi support.
-
-On stretch the django 1.10 is no use so get rid of that:
-apt remove python3-django python-django python-django-common python-django-doc
-
-Then replace with django 1.7 (Needs to be built for stretch)
-apt install python-django python-django-common python-django-doc
-apt install python-django-registration python-django-imagekit python-django-tinymce
-
-then hold them to stop them being upgraded by unattended upgrades:
-echo "python-django hold" | sudo dpkg --set-selections
-echo "python-django-common hold" | sudo dpkg --set-selections
-echo "python-django-doc hold" | sudo dpkg --set-selections
-
-Optimizing server
-I've tweaked the apache and mysql settings to make them a bit more suitable for a small machine. Seems to have shaved 200MB or so off the idling footprint.
-https://www.narga.net/optimizing-apachephpmysql-low-memory-server/
-
-(just discovered 'ab' for running apache performance tests - handy).