diff --git a/docker/.env b/docker/.env index bc47f99..8c2874d 100644 --- a/docker/.env +++ b/docker/.env @@ -29,6 +29,7 @@ DJANGO_DEBUG=True # # There will also be a test_{DJANGO_DB_NAME} database used for running tests. DJANGO_DB_NAME='feedback_plugin' +DJANGO_DB_HOST='db' DJANGO_DB_USER_NAME='feedback' DJANGO_DB_USER_PASSWORD='A;p4rqgDt-Mf7L{z' diff --git a/src/feedback_plugin/settings.py b/src/feedback_plugin/settings.py index f81628f..bed0472 100644 --- a/src/feedback_plugin/settings.py +++ b/src/feedback_plugin/settings.py @@ -20,13 +20,24 @@ # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.environ['DJANGO_SECRET_KEY'] +SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = bool(os.environ['DJANGO_DEBUG']) - -ALLOWED_HOSTS = [os.environ['DJANGO_ALLOWED_HOSTS']] - +DEBUG = bool(os.environ.get('DJANGO_DEBUG')) +if DEBUG == None: + DEBUG = True + +if os.environ.get('DJANGO_ALLOWED_HOSTS'): + ALLOWED_HOSTS = os.environ['DJANGO_ALLOWED_HOSTS'].split(',') +# DB_HOST default value will be DNS on docker_default network for easier usage in docker-compose +# DB_HOST empty means localhost, instead one should set the unix socket and/or other host +DB_HOST = os.environ.get('DJANGO_DB_HOST') +if DB_HOST == None: + DB_HOST = 'docker_db_1' + +LOG_LEVEL = os.environ.get('DJANGO_LOG_LEVEL') +if LOG_LEVEL == None: + LOG_LEVEL = 'ERROR' # Application definition @@ -72,14 +83,13 @@ WSGI_APPLICATION = 'feedback_plugin.wsgi.application' - DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME': os.environ['DJANGO_DB_NAME'], + 'NAME': os.environ.get('DJANGO_DB_NAME'), 'USER': os.environ['DJANGO_DB_USER_NAME'], 'PASSWORD': os.environ['DJANGO_DB_USER_PASSWORD'], - 'HOST': 'db', + 'HOST': DB_HOST, 'OPTIONS': {'charset': 'utf8', 'use_unicode': True}, 'TEST': { @@ -150,12 +160,12 @@ 'loggers': { 'django': { 'handlers': ['console'], - 'level': os.environ['DJANGO_LOG_LEVEL'], + 'level': LOG_LEVEL, 'propagate': False, }, 'views': { 'handlers': ['console'], - 'level': os.environ['DJANGO_LOG_LEVEL'], + 'level': LOG_LEVEL, 'propagate': False, }, },