diff options
| -rw-r--r-- | _deploy/debian-server/credentials.py | 2 | ||||
| -rw-r--r-- | _deploy/debian-server/localsettings-expo-live.py | 9 | ||||
| -rw-r--r-- | localsettings_wsl.py | 16 |
3 files changed, 22 insertions, 5 deletions
diff --git a/_deploy/debian-server/credentials.py b/_deploy/debian-server/credentials.py index 2f856ed..4892a5d 100644 --- a/_deploy/debian-server/credentials.py +++ b/_deploy/debian-server/credentials.py @@ -3,7 +3,7 @@ EXPOUSER = 'expo' EXPOADMINUSER = 'expoadmin' EXPOUSER_EMAIL = 'wookey@wookware.org' EXPOADMINUSER_EMAIL = 'wookey@wookware.org' -import secret_credentials.py +from secret_credentials import * EXPOFILESREMOTE = False # if True, then re-routes urls in expofiles to remote sever #SECURE_SSL_REDIRECT = True # breaks 7 tests in test suite 301 not 200 (or 302) and runserver fails completely diff --git a/_deploy/debian-server/localsettings-expo-live.py b/_deploy/debian-server/localsettings-expo-live.py index 0ed5ff1..9132548 100644 --- a/_deploy/debian-server/localsettings-expo-live.py +++ b/_deploy/debian-server/localsettings-expo-live.py @@ -33,6 +33,11 @@ EMAIL_HOST_USER = "django-test@klebos.net" # Philip Sargent really EMAIL_PORT = 587 EMAIL_USE_TLS = True DEFAULT_FROM_EMAIL = "django-test@klebos.net" +# ----------------------------------------------------------------- +# THINK before you push this to a repo +# - have you checked that secret_credentials.py is in .gitignore ? +# - we don't want to have to change the expo system password ! +# ----------------------------------------------------------------- EXPOFILESREMOTE = False # if True, then re-routes urls in expofiles to remote sever #SECURE_SSL_REDIRECT = True # breaks 7 tests in test suite 301 not 200 (or 302) and runserver fails completely @@ -157,8 +162,8 @@ JSLIB_URL = Path(URL_ROOT, "/javascript/") # used for CaveViewer JS utility #TINY_MCE_MEDIA_ROOT = STATIC_ROOT + '/tiny_mce/' # not needed while TinyMCE not installed #TINY_MCE_MEDIA_URL = STATIC_URL + '/tiny_mce/' # not needed while TinyMCE not installed -LOGFILE = '/var/log/troggle/troggle.log' -IMPORTLOGFILE = '/var/log/troggle/import.log' +LOGFILE = '/var/log/troggle/troggle.log' # hmm. Not used since 2022 +IMPORTLOGFILE = '/var/log/troggle/import.log' # hmm. Not used since 2022 # Sanitise these to be strings as Django seems to be particularly sensitive to crashing if they aren't #STATIC_URL = str(STATIC_URL) + "/" diff --git a/localsettings_wsl.py b/localsettings_wsl.py index 0fdbde7..3fd3d0a 100644 --- a/localsettings_wsl.py +++ b/localsettings_wsl.py @@ -179,10 +179,22 @@ ENTRANCEDESCRIPTIONS = EXPOWEB / "entrance_data" sys.path.append(str(REPOS_ROOT_PATH)) sys.path.append(str(PYTHON_PATH)) -#TINY_MCE_MEDIA_ROOT = STATIC_ROOT + '/tiny_mce/' # not needed while TinyMCE not installed -#TINY_MCE_MEDIA_URL = STATIC_URL + '/tiny_mce/' # not needed while TinyMCE not installed # Sanitise these to be strings as Django seems to be particularly sensitive to crashing if they aren't STATIC_URL = str(STATIC_URL) + "/" MEDIA_URL = str(MEDIA_URL) + "/" +# Re-enable TinyMCE when Dj upgraded to v3. Also templates/editexpopage.html +# TINYMCE_DEFAULT_CONFIG = { +# 'plugins': "table,spellchecker,paste,searchreplace", +# 'theme': "advanced", +# } +# TINYMCE_SPELLCHECKER = False +# TINYMCE_COMPRESSOR = True +#TINY_MCE_MEDIA_ROOT = STATIC_ROOT + '/tiny_mce/' # not needed while TinyMCE not installed +#TINY_MCE_MEDIA_URL = STATIC_URL + '/tiny_mce/' # not needed while TinyMCE not installed + + +# TEST_RUNNER = "django.test.runner.DiscoverRunner" + +print(" + finished importing troggle/localsettings.py")
\ No newline at end of file |