Merge pull request #649 from cdosborn/simplify-vars-send-emails-and-d…

…ebug

Simplify DEBUG and SEND_EMAILS variables

CHANGELOG.md

@@ -28,6 +28,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 ### Changed
   - Increased hard timeouts for tasks
     ([#650](https://github.com/cyverse/atmosphere/pull/650))
+  - Variable changes to DJANGO_DEBUG and SEND_EMAILS
+    ([#649](https://github.com/cyverse/atmosphere/pull/649))
 
 ## [v33-0](https://github.com/cyverse/atmosphere/compare/v32-2...v33-0) - 2018-08-06
 ### Changed

atmosphere/settings/local.py.j2

@@ -19,9 +19,17 @@ SECRETS_MODULE = secrets
 
 globals().update(vars(sys.modules['atmosphere.settings']))
 
-# Debug Mode
-DEBUG = {{ DJANGO_DEBUG | default(True) }}
-SEND_EMAILS = {{ not DJANGO_DEBUG | default(False) }}
+{% if DEBUG %}
+DEBUG = True
+{% else %}
+DEBUG = False
+{% endif %}
+
+{% if SEND_EMAILS %}
+SEND_EMAILS = True
+{% else %}
+SEND_EMAILS = False
+{% endif %}
 
 {% if DJANGO_TEMPLATE_DEBUG -%}
 template_backends = filter(lambda t:

variables.ini.dist

@@ -43,10 +43,11 @@ DATABASE_PASSWORD = atmosphere_db_pass # psql_password
 DATABASE_HOST = localhost # remote.postgres-server.com
 DATABASE_PORT = 5432
 DATABASE_CONN_MAX_AGE = 60 # in seconds
-DJANGO_DEBUG =  True # Boolean required
+DEBUG =  True # Boolean required
 DJANGO_DEBUG_TOOLBAR =  False # Boolean required
 ENFORCING =  False # Boolean required #NOTE: DO NOT SET TO TRUE UNLESS YOU ARE PRODUCTION!
 SSLSERVER =  False # Boolean required
+SEND_EMAILS = False # Boolean required
 ENABLE_PROJECT_SHARING =  True # Boolean required
 ENABLE_IMAGE_VALIDATION =  True # Boolean required
 DJANGO_TEMPLATE_DEBUG =  True # Boolean required