From 0bfcb22447c71811bcd0cdc7176d64d4fd7da482 Mon Sep 17 00:00:00 2001 From: Sandy Walsh Date: Wed, 7 Nov 2012 12:00:02 -0400 Subject: [PATCH] checks local_setting.py file before env vars --- settings.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/settings.py b/settings.py index 998a8ef..05068b6 100644 --- a/settings.py +++ b/settings.py @@ -1,11 +1,20 @@ -# Django settings for stproject project. +# Django settings for StackTach project. import os -db_name = os.environ['STACKTACH_DB_NAME'] -db_host = os.environ.get('STACKTACH_DB_HOST', "") -db_username = os.environ['STACKTACH_DB_USERNAME'] -db_password = os.environ['STACKTACH_DB_PASSWORD'] -install_dir = os.environ['STACKTACH_INSTALL_DIR'] +try: + from local_settings import * + + db_name = STACKTACH_DB_NAME + db_host = STACKTACH_DB_HOST + db_username = STACKTACH_DB_USERNAME + db_password = STACKTACH_DB_PASSWORD + install_dir = STACKTACH_INSTALL_DIR +except ImportError: + db_name = os.environ['STACKTACH_DB_NAME'] + db_host = os.environ.get('STACKTACH_DB_HOST', "") + db_username = os.environ['STACKTACH_DB_USERNAME'] + db_password = os.environ['STACKTACH_DB_PASSWORD'] + install_dir = os.environ['STACKTACH_INSTALL_DIR'] DEBUG = False TEMPLATE_DEBUG = DEBUG