matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move Docker environment overrides to main base.py module

Browse Source 
Signed-off-by: Eric Riggs <ericriggs42@gmail.com>
This commit is contained in:
Eric Riggs
2018-04-22 04:17:28 -04:00
parent bbc338120e
commit 455fcef114
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mayan/settings/base.py
View File

@@ -18,10 +18,7 @@ from django.utils.translation import ugettext_lazy as _
import mayan import mayan
# Literals from .literals import DEFAULT_SECRET_KEY, SECRET_KEY_FILENAME, SYSTEM_DIR
DEFAULT_SECRET_KEY = 'secret_key_missing'
SECRET_KEY_FILENAME = 'SECRET_KEY'
SYSTEM_DIR = 'system'
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -112,6 +109,7 @@ INSTALLED_APPS = (
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'common.middleware.error_logging.ErrorLoggingMiddleware', 'common.middleware.error_logging.ErrorLoggingMiddleware',
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
'whitenoise.middleware.WhiteNoiseMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
'corsheaders.middleware.CorsMiddleware', 'corsheaders.middleware.CorsMiddleware',
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
@@ -152,7 +150,7 @@ WSGI_APPLICATION = 'mayan.wsgi.application'
# Database # Database
# https://docs.djangoproject.com/en/1.10/ref/settings/#databases # https://docs.djangoproject.com/en/1.10/ref/settings/#databases
MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_ROOT = os.environ.get('MAYAN_MEDIA_ROOT', os.path.join(BASE_DIR, 'media'))
DATABASES = { DATABASES = {
'default': { 'default': {
@@ -313,14 +311,18 @@ else:
# Celery # Celery
environment_celery_always_eager = os.environ.get('MAYAN_CELERY_ALWAYS_EAGER', 'True') environment_celery_always_eager = os.environ.get('MAYAN_CELERY_ALWAYS_EAGER')
if environment_celery_always_eager == 'True': if environment_celery_always_eager == 'True':
CELERY_ALWAYS_EAGER = True CELERY_ALWAYS_EAGER = True
elif environment_celery_always_eager == 'False': elif environment_celery_always_eager == 'False':
CELERY_ALWAYS_EAGER = False CELERY_ALWAYS_EAGER = False
CELERY_RESULT_BACKEND = os.environ.get('MAYAN_CELERY_RESULT_BACKEND', None) CELERY_RESULT_BACKEND = os.environ.get(
BROKER_URL = os.environ.get('MAYAN_BROKER_URL', None) 'MAYAN_CELERY_RESULT_BACKEND', 'redis://127.0.0.1:6379/0'
)
BROKER_URL = os.environ.get(
'MAYAN_BROKER_URL', 'redis://127.0.0.1:6379/0'
)
# Database # Database

5
mayan/settings/literals.py Normal file
View File

@@ -0,0 +1,5 @@
from __future__ import unicode_literals
DEFAULT_SECRET_KEY = 'secret_key_missing'
SECRET_KEY_FILENAME = 'SECRET_KEY'
SYSTEM_DIR = 'system'