Self hosted FLOSS fitness/workout, nutrition and weight tracker
Simplify the db config
Roland Geiderd7f5772ce73d
diff --git a/extras/docker/demo/Dockerfile b/extras/docker/demo/Dockerfileindex 5410006c5..7ac266482 100644--- a/extras/docker/demo/Dockerfile+++ b/extras/docker/demo/Dockerfile@@ -109,6 +109,7 @@ ENV PYTHONPATH=/home/wger/srcENV DJANGO_SETTINGS_MODULE=settings.mainENV MEDIA_ROOT=/home/wger/mediaENV STATIC_ROOT=/home/wger/static+ENV DJANGO_DB_ENGINE=django.db.backends.sqlite3ENV DJANGO_DB_DATABASE=/home/wger/db/database.sqliteENV DJANGO_CACHE_BACKEND=django.core.cache.backends.locmem.LocMemCachediff --git a/settings/main.py b/settings/main.pyindex 9e2c36b12..6a2d34508 100644--- a/settings/main.py+++ b/settings/main.py@@ -63,22 +63,15 @@ if os.environ.get('DJANGO_ADMINS'):if os.environ.get('PS_DATABASE_URI'):DATABASES = {'default': env.db_url('PS_DATABASE_URI')}-elif os.environ.get('DJANGO_DB_ENGINE'):+else:DATABASES = {'default': {'ENGINE': env.str('DJANGO_DB_ENGINE'),'NAME': env.str('DJANGO_DB_DATABASE'),- 'USER': env.str('DJANGO_DB_USER'),- 'PASSWORD': env.str('DJANGO_DB_PASSWORD'),- 'HOST': env.str('DJANGO_DB_HOST'),- 'PORT': env.int('DJANGO_DB_PORT'),- }- }-else:- DATABASES = {- 'default': {- 'ENGINE': 'django.db.backends.sqlite3',- 'NAME': env.str('DJANGO_DB_DATABASE', '/home/wger/db/database.sqlite'),+ 'USER': env.str('DJANGO_DB_USER', ''),+ 'PASSWORD': env.str('DJANGO_DB_PASSWORD', ''),+ 'HOST': env.str('DJANGO_DB_HOST', ''),+ 'PORT': env.int('DJANGO_DB_PORT', 5432),}}PS_STORAGE_PG_URI = env.str(