Changeset - 015b3ea9d1c2
[Not reviewed]
Merge
0 1 0
Christopher Neugebauer - 3 years ago 2017-09-18 03:27:20
chrisjrn@gmail.com
Merge branch 'prod'
1 file changed with 3 insertions and 1 deletions:
0 comments (0 inline, 0 general)
pinaxcon/settings.py
Show inline comments
...
 
@@ -30,6 +30,8 @@ from_email = os.environ.get("DJANGO_DEFAULT_FROM_EMAIL", None)
 
if from_email is not None:
 
    DEFAULT_FROM_EMAIL = from_email
 

	
 
SERVER_EMAIL = DEFAULT_FROM_EMAIL
 

	
 
# Local time zone for this installation. Choices can be found here:
 
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 
# although not all choices may be available on all operating systems.
...
 
@@ -43,7 +45,7 @@ TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles")
 
# Set the email address that will receive errors.
 
admin_email = os.environ.get("DJANGO_ADMIN_EMAIL", None)
 
if admin_email is not None:
 
    ADMINS = ("Webmaster", admin_email)
 
    ADMINS = [("Webmaster", admin_email)]
 

	
 

	
 
# Use SSLRedirectMiddleware
0 comments (0 inline, 0 general)