Squashed commit of the following:

commit 99fd94580f95dcbfb77b73e2de846f76a5709ef9
Author: Sonny <sonnyba871@gmail.com>
Date:   Sat Feb 15 21:45:16 2020 +0100

    Use postgres password

    As of https://gitlab.com/gitlab-com/support-forum/issues/5199
This commit is contained in:
Sonny 2020-02-16 12:21:25 +01:00
parent ee22e0a0ae
commit 5976870d38
5 changed files with 20 additions and 26 deletions

View file

@ -84,8 +84,10 @@ WSGI_APPLICATION = "newsreader.wsgi.application"
DATABASES = {
"default": {
"ENGINE": "django.db.backends.postgresql_psycopg2",
"NAME": "newsreader",
"USER": "newsreader",
"HOST": os.environ.get("POSTGRES_HOST"),
"NAME": os.environ.get("POSTGRES_NAME"),
"USER": os.environ.get("POSTGRES_USER"),
"PASSWORD": os.environ.get("POSTGRES_PASSWORD"),
}
}

View file

@ -1,17 +1,6 @@
from .dev import *
# Database
# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
DATABASES = {
"default": {
"ENGINE": "django.db.backends.postgresql_psycopg2",
"NAME": "newsreader",
"USER": "newsreader",
"HOST": "db",
}
}
# Celery
# https://docs.celeryproject.org/en/latest/userguide/configuration.html
BROKER_URL = "amqp://guest:guest@rabbitmq:5672//"

View file

@ -4,12 +4,3 @@ from .base import * # noqa
DEBUG = True
EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
DATABASES = {
"default": {
"ENGINE": "django.db.backends.postgresql_psycopg2",
"NAME": "newsreader",
"USER": "newsreader",
"HOST": "postgres",
}
}