cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-07-11 08:32:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor POSTGRES_HOST env

Browse Source
This commit is contained in:
Nikita P. Shupeyko 2018-05-09 12:49:39 +03:00
parent b4b3c04253
commit 906299ae39
6 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/developing-locally-docker.rst
View File

@ -115,6 +115,7 @@ Consider the aforementioned ``.envs/.local/.postgres``: ::
# PostgreSQL # PostgreSQL
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
POSTGRES_HOST=postgres
POSTGRES_DB=<your project slug> POSTGRES_DB=<your project slug>
POSTGRES_USER=XgOWtQtJecsAbaIyslwGvFvPawftNaqO POSTGRES_USER=XgOWtQtJecsAbaIyslwGvFvPawftNaqO
POSTGRES_PASSWORD=jSljDz4whHuwO3aJIgVBrqEml5Ycbghorep4uVJ4xjDYQu0LfuTZdctj7y0YcCLu POSTGRES_PASSWORD=jSljDz4whHuwO3aJIgVBrqEml5Ycbghorep4uVJ4xjDYQu0LfuTZdctj7y0YcCLu

1
{{cookiecutter.project_slug}}/.envs/.local/.postgres
View File

@ -1,5 +1,6 @@
# PostgreSQL # PostgreSQL
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
POSTGRES_HOST=postgres
POSTGRES_DB={{ cookiecutter.project_slug }} POSTGRES_DB={{ cookiecutter.project_slug }}
POSTGRES_USER=!!!SET POSTGRES_USER!!! POSTGRES_USER=!!!SET POSTGRES_USER!!!
POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!! POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!!

1
{{cookiecutter.project_slug}}/.envs/.production/.postgres
View File

@ -1,5 +1,6 @@
# PostgreSQL # PostgreSQL
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
POSTGRES_HOST=postgres
POSTGRES_DB={{ cookiecutter.project_slug }} POSTGRES_DB={{ cookiecutter.project_slug }}
POSTGRES_USER=!!!SET POSTGRES_USER!!! POSTGRES_USER=!!!SET POSTGRES_USER!!!
POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!! POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!!

4
{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
View File

@ -14,7 +14,7 @@ if [ -z "${POSTGRES_USER}" ]; then
base_postgres_image_default_user='postgres' base_postgres_image_default_user='postgres'
export POSTGRES_USER="${base_postgres_image_default_user}" export POSTGRES_USER="${base_postgres_image_default_user}"
fi fi
export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}" export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}"
postgres_ready() { postgres_ready() {
python << END python << END
@ -27,7 +27,7 @@ try:
dbname="${POSTGRES_DB}", dbname="${POSTGRES_DB}",
user="${POSTGRES_USER}", user="${POSTGRES_USER}",
password="${POSTGRES_PASSWORD}", password="${POSTGRES_PASSWORD}",
host="postgres" host="${POSTGRES_HOST}"
) )
except psycopg2.OperationalError: except psycopg2.OperationalError:
sys.exit(-1) sys.exit(-1)

2
{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backup
View File

@ -25,7 +25,7 @@ if [[ "${POSTGRES_USER}" == "postgres" ]]; then
exit 1 exit 1
fi fi
export PGHOST="postgres" export PGHOST="${POSTGRES_HOST}"
export PGUSER="${POSTGRES_USER}" export PGUSER="${POSTGRES_USER}"
export PGPASSWORD="${POSTGRES_PASSWORD}" export PGPASSWORD="${POSTGRES_PASSWORD}"
export PGDATABASE="${POSTGRES_DB}" export PGDATABASE="${POSTGRES_DB}"

2
{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/restore
View File

@ -37,7 +37,7 @@ if [[ "${POSTGRES_USER}" == "postgres" ]]; then
exit 1 exit 1
fi fi
export PGHOST="postgres" export PGHOST="${POSTGRES_HOST}"
export PGUSER="${POSTGRES_USER}" export PGUSER="${POSTGRES_USER}"
export PGPASSWORD="${POSTGRES_PASSWORD}" export PGPASSWORD="${POSTGRES_PASSWORD}"
export PGDATABASE="${POSTGRES_DB}" export PGDATABASE="${POSTGRES_DB}"