Add support for REDIS_URL and DATABASE_URL in settings.

(preparation for Heroku support - #1092)
getredash · Jun 6, 2016 · fcc656e · fcc656e
1 parent 2bc0b27
commit fcc656e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/redash/settings.py b/redash/settings.py
@@ -55,15 +55,15 @@ def all_settings():
 NAME = os.environ.get('REDASH_NAME', 're:dash')
 LOGO_URL = os.environ.get('REDASH_LOGO_URL', '/images/redash_icon_small.png')
 
-REDIS_URL = os.environ.get('REDASH_REDIS_URL', "redis://localhost:6379/0")
+REDIS_URL = os.environ.get('REDASH_REDIS_URL', os.environ.get('REDIS_URL', "redis://localhost:6379/0"))
 PROXIES_COUNT = int(os.environ.get('REDASH_PROXIES_COUNT', "1"))
 
 STATSD_HOST = os.environ.get('REDASH_STATSD_HOST', "127.0.0.1")
 STATSD_PORT = int(os.environ.get('REDASH_STATSD_PORT', "8125"))
 STATSD_PREFIX = os.environ.get('REDASH_STATSD_PREFIX', "redash")
 
 # Connection settings for re:dash's own database (where we store the queries, results, etc)
-DATABASE_CONFIG = parse_db_url(os.environ.get("REDASH_DATABASE_URL", "postgresql://postgres"))
+DATABASE_CONFIG = parse_db_url(os.environ.get("REDASH_DATABASE_URL", os.environ.get('DATABASE_URL', "postgresql://postgres")))
 
 # Celery related settings
 CELERY_BROKER = os.environ.get("REDASH_CELERY_BROKER", REDIS_URL)