From 1ea684737af13d0ae04ac7fde2326fe540c2f671 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 24 May 2018 23:34:04 -0400 Subject: [PATCH] Move SQLite setup as a fallback default the database manager setup block. Signed-off-by: Roberto Rosario --- mayan/settings/base.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/mayan/settings/base.py b/mayan/settings/base.py index 40a44791f8..9fd6726097 100644 --- a/mayan/settings/base.py +++ b/mayan/settings/base.py @@ -161,13 +161,6 @@ MEDIA_ROOT = os.environ.get( 'MAYAN_MEDIA_ROOT', os.path.join(BASE_DIR, 'media') ) -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(MEDIA_ROOT, 'db.sqlite3'), - } -} - # Password validation # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators @@ -344,7 +337,6 @@ CELERY_ALWAYS_EAGER = env.bool('MAYAN_CELERY_ALWAYS_EAGER', default=True) CELERY_RESULT_BACKEND = os.environ.get('MAYAN_CELERY_RESULT_BACKEND') # ----- Database ----- - environment_database_engine = os.environ.get('MAYAN_DATABASE_ENGINE') if environment_database_engine: @@ -363,7 +355,13 @@ if environment_database_engine: 'CONN_MAX_AGE': environment_database_conn_max_age, } } - +else: + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(MEDIA_ROOT, 'db.sqlite3'), + } + } # ----- Debug ----- DEBUG = env.bool('MAYAN_DEBUG', default=False)