diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 15be2c40d..c5c03ea71 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -94,4 +94,4 @@ def test_connection_max_age(cookies): expected = "DATABASES['default']['CONN_MAX_AGE'] = env.int('CONN_MAX_AGE', default=60)" - assert expected in prod_config_lines, prod_config_lines + assert expected in prod_config_lines diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index f4a40f98d..9eeb46bc4 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -169,7 +169,7 @@ TEMPLATES[0]['OPTIONS']['loaders'] = [ ('django.template.loaders.cached.Loader', [ 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', ]), ] - +{% set _DEFAULT_CONN_MAX_AGE=60 %} # DATABASE CONFIGURATION # ------------------------------------------------------------------------------ {% if cookiecutter.use_elasticbeanstalk_experimental.lower() == 'y' -%} @@ -182,14 +182,14 @@ DATABASES = { 'PASSWORD': env('RDS_PASSWORD'), 'HOST': env('RDS_HOSTNAME'), 'PORT': env('RDS_PORT'), - 'CONN_MAX_AGE': env.int('CONN_MAX_AGE', default=60), + 'CONN_MAX_AGE': env.int('CONN_MAX_AGE', default={{ _DEFAULT_CONN_MAX_AGE }}), } } {% else %} # Use the Heroku-style specification # Raises ImproperlyConfigured exception if DATABASE_URL not in os.environ DATABASES['default'] = env.db('DATABASE_URL') -DATABASES['default']['CONN_MAX_AGE'] = env.int('CONN_MAX_AGE', default=60) +DATABASES['default']['CONN_MAX_AGE'] = env.int('CONN_MAX_AGE', default={{ _DEFAULT_CONN_MAX_AGE }}) {%- endif %} # CACHING diff --git a/{{cookiecutter.project_slug}}/env.example b/{{cookiecutter.project_slug}}/env.example index 896995ba1..420ab4a5f 100644 --- a/{{cookiecutter.project_slug}}/env.example +++ b/{{cookiecutter.project_slug}}/env.example @@ -2,7 +2,7 @@ # PostgreSQL POSTGRES_PASSWORD=mysecretpass POSTGRES_USER=postgresuser -CONN_MAX_AGE=60 +CONN_MAX_AGE= # Domain name, used by caddy DOMAIN_NAME={{ cookiecutter.domain_name }}