only set if specified

Author: taylor-fuller

extras/docker/development/settings.py

@@ -110,20 +110,34 @@
             'LOCATION': env.str("DJANGO_CACHE_LOCATION"),
             'TIMEOUT': env.int("DJANGO_CACHE_TIMEOUT"),
             'OPTIONS': {
-                'CLIENT_CLASS': env.str("DJANGO_CACHE_CLIENT_CLASS"),
-                'CONNECTION_POOL_KWARGS': {
-                    "ssl_keyfile": env.str('DJANGO_CACHE_CLIENT_SSL_KEY_FILE', None),
-                    "ssl_certfile": env.str('DJANGO_CACHE_CLIENT_SSL_CERT_FILE', None),
-                    "ssl_cert_reqs": env.str('DJANGO_CACHE_CLIENT_SSL_CERT_REQS', 'required'),
-                    "ssl_check_hostname": env.str('DJANGO_CACHE_CLIENT_SSL_CHECK_HOSTNAME', False)
-                }
+                'CLIENT_CLASS': env.str("DJANGO_CACHE_CLIENT_CLASS")
             }
         }
     }
 
     if os.environ.get('DJANGO_CACHE_CLIENT_PASSWORD'):
         CACHES['default']['OPTIONS']['PASSWORD'] = env.str('DJANGO_CACHE_CLIENT_PASSWORD')
 
+    CONNECTION_POOL_KWARGS = dict()
+    if "DJANGO_CACHE_CLIENT_SSL_KEYFILE" in os.environ:
+        CONNECTION_POOL_KWARGS.update(
+            {"ssl_keyfile", env.str("DJANGO_CACHE_CLIENT_SSL_KEYFILE")})
+
+    if "DJANGO_CACHE_CLIENT_SSL_CERTFILE" in os.environ:
+        CONNECTION_POOL_KWARGS.update(
+            {"ssl_certfile", env.str("DJANGO_CACHE_CLIENT_SSL_CERTFILE")})
+
+    if "DJANGO_CACHE_CLIENT_SSL_CERT_REQS" in os.environ:
+        CONNECTION_POOL_KWARGS.update(
+            {"ssl_cert_reqs", env.str("DJANGO_CACHE_CLIENT_SSL_CERT_REQS")})
+
+    if "DJANGO_CACHE_CLIENT_SSL_CHECK_HOSTNAME" in os.environ:
+        CONNECTION_POOL_KWARGS.update(
+            {"ssl_check_hostname", env.bool("DJANGO_CACHE_CLIENT_SSL_CHECK_HOSTNAME")})
+
+    if len(CONNECTION_POOL_KWARGS) > 0:
+        CACHES["default"]["OPTIONS"]["CONNECTION_POOL_KWARGS"] = CONNECTION_POOL_KWARGS
+
 # Folder for compressed CSS and JS files
 COMPRESS_ROOT = STATIC_ROOT