diff options
| -rw-r--r-- | databaseReset.py | 3 | ||||
| -rw-r--r-- | localsettingsWSL.py | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/databaseReset.py b/databaseReset.py index c900181..3f76f11 100644 --- a/databaseReset.py +++ b/databaseReset.py @@ -6,6 +6,7 @@ import json import resource import settings +import credentials """ Command-line utility for loading cave data files into troggle's database. The command line options select which combination of classes of data will be imported, @@ -55,7 +56,7 @@ if os.geteuid() == 0: exit() expouser=settings.EXPOUSER -expouserpass=settings.EXPOUSERPASS +expouserpass=credentials.EXPOUSERPASS expouseremail=settings.EXPOUSER_EMAIL def reinit_db(): diff --git a/localsettingsWSL.py b/localsettingsWSL.py index 670533e..3a9a793 100644 --- a/localsettingsWSL.py +++ b/localsettingsWSL.py @@ -23,12 +23,13 @@ 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, then get overwritten by real secrets imported from credentials.py -EXPOUSERPASS = "nnn:gggggg" -EMAIL_HOST_PASSWORD = "insert-real-email-password-here" +# default values, real secrets imported from credentials.py +# EXPOUSERPASS = "nnn:gggggg" +# EMAIL_HOST_PASSWORD = "insert-real-email-password-here" from credentials import EXPOUSERPASS from credentials import EMAIL_HOST_PASSWORD + 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 @@ -163,5 +164,7 @@ REPOS_ROOT_PATH = os.fspath(REPOS_ROOT_PATH) TEMPLATE_PATH = os.fspath(TROGGLE_PATH) MEDIA_ROOT = os.fspath(MEDIA_ROOT) JSLIB_ROOT = os.fspath(JSLIB_ROOT) - +JSLIB_ROOT = os.fspath(JSLIB_ROOT) +JSLIB_ROOT = os.fspath(JSLIB_ROOT) +SURVEY_SCANS = os.fspath(SURVEY_SCANS) print(" + finished importing troggle/localsettings.py") |