Commit cf748391 authored by Luuk Scholten's avatar Luuk Scholten
Browse files

Merge branch '361-postgres_db-setting-not-respected' into 'master'

Fix production settings application

Closes #361

See merge request !414
parents 4e82797d 34ce276a
......@@ -41,14 +41,10 @@ if 'DJANGO_HOSTS' in os.environ:
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
'NAME': os.environ.get('POSTGRES_USER'),
'USER': 'postgres',
'DATABASE': os.environ.get('POSTGRES_DB'),
'USER': os.environ.get('POSTGRES_USER', 'postgres'),
'NAME': os.environ.get('POSTGRES_DB'),
'HOST': os.environ.get('DJANGO_POSTGRES_HOST'),
'PORT': 5432,
'TEST': {
'NAME': 'thaliatest',
}
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment