From 167662f23f8acc81a79b8fb42b68dae9f96ea7cb Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Thu, 2 Nov 2017 10:24:01 +0000
Subject: [PATCH] Get CONN_MAX_AGE from the environment, default to 60 in .env

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 4 ++--
 {{cookiecutter.project_slug}}/env.example                   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 531426771..f4a40f98d 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -182,14 +182,14 @@ DATABASES = {
         'PASSWORD': env('RDS_PASSWORD'),
         'HOST': env('RDS_HOSTNAME'),
         'PORT': env('RDS_PORT'),
-        'CONN_MAX_AGE': 60,
+        'CONN_MAX_AGE': env.int('CONN_MAX_AGE', default=60),
     }
 }
 {% 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'] = 60
+DATABASES['default']['CONN_MAX_AGE'] = env.int('CONN_MAX_AGE', default=60)
 {%- endif %}
 
 # CACHING
diff --git a/{{cookiecutter.project_slug}}/env.example b/{{cookiecutter.project_slug}}/env.example
index cbde76499..896995ba1 100644
--- a/{{cookiecutter.project_slug}}/env.example
+++ b/{{cookiecutter.project_slug}}/env.example
@@ -2,6 +2,7 @@
 # PostgreSQL
 POSTGRES_PASSWORD=mysecretpass
 POSTGRES_USER=postgresuser
+CONN_MAX_AGE=60
 
 # Domain name, used by caddy
 DOMAIN_NAME={{ cookiecutter.domain_name }}