Changeset - 15d90dc0bcb2
[Not reviewed]
0 1 0
Brett Smith - 5 years ago 2018-10-04 20:16:41
brettcsmith@brettcsmith.org
settings: Read more from environment variables.
1 file changed with 3 insertions and 5 deletions:
0 comments (0 inline, 0 general)
pinaxcon/settings.py
Show inline comments
...
 
@@ -6,7 +6,7 @@ PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir
 
PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
 
BASE_DIR = PACKAGE_ROOT
 

	
 
DEBUG = bool(int(os.environ.get("DEBUG", "1")))
 
DEBUG = bool(int(os.environ.get("DJANGO_DEBUG", "1")))
 

	
 
DATABASES = {
 
    "default": {
...
 
@@ -20,7 +20,7 @@ import dj_database_url
 
db_from_env = dj_database_url.config()
 
DATABASES['default'].update(db_from_env)
 

	
 
ALLOWED_HOSTS = [".localhost", ".herokuapp.com", ".northbaypython.org", "127.0.0.1"]
 
ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS", "localhost").split()
 
CANONICAL_HOST = os.environ.get("DJANGO_CANONICAL_HOST", None)
 

	
 
# If DEFAULT_FROM_EMAIL is not set, email will most likely break in prod.
...
 
@@ -31,7 +31,6 @@ if from_email is not None:
 
    
 
THEME_CONTACT_EMAIL = os.environ.get("THEME_CONTACT_EMAIL", None)
 
    
 

	
 
# 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.
...
 
@@ -39,8 +38,7 @@ THEME_CONTACT_EMAIL = os.environ.get("THEME_CONTACT_EMAIL", None)
 
# timezone as the operating system.
 
# If running in a Windows environment this must be set to the same as your
 
# system time zone.
 
TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles")
 

	
 
TIME_ZONE = os.environ.get("TZ")
 

	
 
# Set the email address that will receive errors.
 
admin_email = os.environ.get("DJANGO_ADMIN_EMAIL", None)
0 comments (0 inline, 0 general)