From 7730b2535f1f88740ac1f683b608d594054f7db8 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Thu, 12 Dec 2024 17:09:36 +0000 Subject: [PATCH] tidying --- _deploy/wsl/localsettingsWSL.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/_deploy/wsl/localsettingsWSL.py b/_deploy/wsl/localsettingsWSL.py index 3f43c11..5bc647e 100644 --- a/_deploy/wsl/localsettingsWSL.py +++ b/_deploy/wsl/localsettingsWSL.py @@ -25,17 +25,19 @@ print(" * importing troggle/localsettings.py") # - have you checked that credentials.py is in .gitignore ? # - we don't want to have to change the expo system password ! # ----------------------------------------------------------------- -# default values, real secrets imported from credentials.py +# default values, real secrets will be imported from credentials.py in future SECRET_KEY = "real-SECRET_KEY--imported-from-localsettings.py" EXPOUSERPASS = "nnn:gggggg - real-expo-password---imported-from-localsettings.py" EXPOADMINUSERPASS = "gggggg:nnn - real-expo-password---imported-from-localsettings.py" EMAIL_HOST_PASSWORD = "real-email-password---imported-from-localsettings.py" -EXPOFILESREMOTE = False # if True, then re-routes urls in expofiles to remote sever. Tests are then less accurate. -# SECURE_SSL_REDIRECT = True # breaks 7 tests in test suite 301 not 200 (or 302) and runserver fails completely +SQLITEFILE = "/home/philip/expo/troggle.sqlite" # can be ':memory:' -SERVERPORT = "8000" # not needed +PHOTOSREMOTE = False # if True, then re-routes urls in expofiles/photos to remote server. Not implemented yet +EXPOFILESREMOTE = False # if True, then re-routes urls in expofiles to remote server. Tests are then less accurate. +# SECURE_SSL_REDIRECT = True # breaks 7 tests in test suite 301 not 200 (or 302) and runserver fails completely +SERVERPORT = "8000" # not needed as it is the default PV = "python" + str(sys.version_info.major) + "." + str(sys.version_info.minor) @@ -95,7 +97,7 @@ SURVEXPORT = "survexport" # for parsing .3d files and producing .pos files DBSQLITE = { "default": { "ENGINE": "django.db.backends.sqlite3", # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - "NAME": "/home/philip/expo/troggle.sqlite", + "NAME": SQLITEFILE, # 'NAME' : ':memory:', "USER": "expo", # Not used with sqlite3. "PASSWORD": "sekrit", # Not used with sqlite3.