From 1f0e055e67333118b9f444c9c382b3274c630c39 Mon Sep 17 00:00:00 2001 From: Nathan Victor Date: Wed, 26 Jul 2017 16:46:17 -0500 Subject: [PATCH 1/3] make the database cookiecutter connection and use of .env in that regard more clear for #490 and #270 --- {{cookiecutter.project_slug}}/config/settings/base.py | 10 +++++++++- {{cookiecutter.project_slug}}/env.example | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 274e28067..4a9409f83 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -109,7 +109,15 @@ MANAGERS = ADMINS # ------------------------------------------------------------------------------ # See: https://docs.djangoproject.com/en/dev/ref/settings/#databases DATABASES = { - 'default': env.db('DATABASE_URL', default='postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}'), + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': '{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}', + 'USER': env.db('DATABASE_USER', default=''), + 'PASSWORD': env.db('DATABASE_PASSWORD', default=''), + 'HOST': '127.0.0.1', + 'PORT': '', + 'CONN_MAX_AGE': 0 + } } DATABASES['default']['ATOMIC_REQUESTS'] = True diff --git a/{{cookiecutter.project_slug}}/env.example b/{{cookiecutter.project_slug}}/env.example index 138b75fd9..8abf4ea14 100644 --- a/{{cookiecutter.project_slug}}/env.example +++ b/{{cookiecutter.project_slug}}/env.example @@ -1,7 +1,7 @@ # PostgreSQL -POSTGRES_PASSWORD=mysecretpass -POSTGRES_USER=postgresuser +DATABASE_PASSWORD=mysecretpass +DATABASE_USER=postgresuser # General settings # DJANGO_READ_DOT_ENV_FILE=True From e1081c021286c803da33441f60f63b13e95bd7f1 Mon Sep 17 00:00:00 2001 From: Nathan Victor Date: Thu, 27 Jul 2017 10:09:17 -0500 Subject: [PATCH 2/3] passes with tox on my machine, but the travis build fails due to database connection port. trying localhost over 127.0.0.1 --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 4a9409f83..5393c9871 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -114,7 +114,7 @@ DATABASES = { 'NAME': '{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}', 'USER': env.db('DATABASE_USER', default=''), 'PASSWORD': env.db('DATABASE_PASSWORD', default=''), - 'HOST': '127.0.0.1', + 'HOST': 'localhost', 'PORT': '', 'CONN_MAX_AGE': 0 } From a284b08aec64a1c1f03311334b627c444f93f973 Mon Sep 17 00:00:00 2001 From: Nathan Victor Date: Thu, 27 Jul 2017 10:50:58 -0500 Subject: [PATCH 3/3] change env vars back to og --- {{cookiecutter.project_slug}}/config/settings/base.py | 4 ++-- {{cookiecutter.project_slug}}/env.example | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 5393c9871..90a5ee388 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -112,8 +112,8 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql', 'NAME': '{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}', - 'USER': env.db('DATABASE_USER', default=''), - 'PASSWORD': env.db('DATABASE_PASSWORD', default=''), + 'USER': env.db('POSTGRES_USER', default=''), + 'PASSWORD': env.db('POSTGRES_PASSWORD', default=''), 'HOST': 'localhost', 'PORT': '', 'CONN_MAX_AGE': 0 diff --git a/{{cookiecutter.project_slug}}/env.example b/{{cookiecutter.project_slug}}/env.example index 8abf4ea14..138b75fd9 100644 --- a/{{cookiecutter.project_slug}}/env.example +++ b/{{cookiecutter.project_slug}}/env.example @@ -1,7 +1,7 @@ # PostgreSQL -DATABASE_PASSWORD=mysecretpass -DATABASE_USER=postgresuser +POSTGRES_PASSWORD=mysecretpass +POSTGRES_USER=postgresuser # General settings # DJANGO_READ_DOT_ENV_FILE=True