Commit b8eb7a09 by Joe Blaylock

More jabber settings brought in from json env

* In addition to the JABBER settings, now we want to be sure to get
  DATABASE_ROUTERS, too.
parent 5c9857bf
......@@ -104,6 +104,7 @@ PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME)
SITE_NAME = ENV_TOKENS['SITE_NAME']
SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
JABBER = ENV_TOKENS.get('JABBER', {})
DATABASE_ROUTERS = ENV_TOKENS.get('DATABASE_ROUTERS', [])
# allow for environments to specify what cookie name our login subsystem should use
# this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can
......
......@@ -758,6 +758,7 @@ TEMPLATE_VISIBLE_SETTINGS = [
############################### CHAT ################################
JABBER = {}
DATABASE_ROUTERS = []
############################### THEME ################################
def enable_theme(theme_name):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment