From 9e913b254236013469d5595460e339b733dc3ecb Mon Sep 17 00:00:00 2001 From: Alejandro Franco Date: Wed, 22 Jun 2022 14:41:15 -0500 Subject: [PATCH] Fix entrypoint/.envs variables, theme rtd for docs --- .../compose/production/django/entrypoint | 6 ++++-- {{cookiecutter.project_slug}}/docs/conf.py | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint index 95ab8297a..b53e2959b 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint +++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint @@ -7,14 +7,16 @@ set -o nounset {% if cookiecutter.use_celery == 'y' %} # N.B. If only .env files supported variable expansion... -export CELERY_BROKER_URL="${REDIS_URL}" +# export CELERY_BROKER_URL="${REDIS_URL}" +# Updated in .envs {% endif %} if [ -z "${POSTGRES_USER}" ]; then base_postgres_image_default_user='postgres' export POSTGRES_USER="${base_postgres_image_default_user}" fi -export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}" +#export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}" +# Updated in .envs postgres_ready() { python << END diff --git a/{{cookiecutter.project_slug}}/docs/conf.py b/{{cookiecutter.project_slug}}/docs/conf.py index c640e1c63..69af11fde 100644 --- a/{{cookiecutter.project_slug}}/docs/conf.py +++ b/{{cookiecutter.project_slug}}/docs/conf.py @@ -46,6 +46,8 @@ author = "{{ cookiecutter.author_name }}" extensions = [ "sphinx.ext.autodoc", "sphinx.ext.napoleon", + "sphinx_rtd_theme", + 'sphinx.ext.todo', ] # Add any paths that contain templates here, relative to this directory. @@ -61,7 +63,7 @@ exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -html_theme = "alabaster" +html_theme = "sphinx_rtd_theme" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files,