xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues4 Pull Requests Projects1 Wiki Activity

fix password import error

Browse Source
This commit is contained in:
Philip Sargent 2021-04-03 00:33:55 +01:00
parent 52c1dabd0e
commit 912e447200
2 changed files with 9 additions and 5 deletions

3
databaseReset.py

@ -6,6 +6,7 @@ import json
import resource import resource
import settings import settings
import credentials
""" Command-line utility for loading cave data files into troggle's database. """ 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, The command line options select which combination of classes of data will be imported,
@ -55,7 +56,7 @@ if os.geteuid() == 0:
exit() exit()
expouser=settings.EXPOUSER expouser=settings.EXPOUSER
expouserpass=settings.EXPOUSERPASS expouserpass=credentials.EXPOUSERPASS
expouseremail=settings.EXPOUSER_EMAIL expouseremail=settings.EXPOUSER_EMAIL
def reinit_db(): def reinit_db():

11
localsettingsWSL.py

@ -23,12 +23,13 @@ print(" * importing troggle/localsettings.py")
# - have you checked that credentials.py is in .gitignore ? # - have you checked that credentials.py is in .gitignore ?
# - we don't want to have to change the expo system password ! # - we don't want to have to change the expo system password !
#----------------------------------------------------------------- #-----------------------------------------------------------------
# default values, then get overwritten by real secrets imported from credentials.py # default values, real secrets imported from credentials.py
EXPOUSERPASS = "nnn:gggggg" # EXPOUSERPASS = "nnn:gggggg"
EMAIL_HOST_PASSWORD = "insert-real-email-password-here" # EMAIL_HOST_PASSWORD = "insert-real-email-password-here"
from credentials import EXPOUSERPASS from credentials import EXPOUSERPASS
from credentials import EMAIL_HOST_PASSWORD from credentials import EMAIL_HOST_PASSWORD
EXPOFILESREMOTE = False # if True, then re-routes urls in expofiles to remote sever. Tests are then less accurate. 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 #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) TEMPLATE_PATH = os.fspath(TROGGLE_PATH)
MEDIA_ROOT = os.fspath(MEDIA_ROOT) MEDIA_ROOT = os.fspath(MEDIA_ROOT)
JSLIB_ROOT = os.fspath(JSLIB_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") print(" + finished importing troggle/localsettings.py")