From 034de2cfd2f0172d89a686977ad3b3664fd47658 Mon Sep 17 00:00:00 2001 From: Jason Bau Date: Fri, 19 Jul 2013 16:17:57 -0700 Subject: [PATCH] Allow session backend to be configurable and also add PLATFORM_NAME to cms settings (it was throwing 500s for Stanford when the CMS calls render_from_lms) --- cms/envs/aws.py | 5 +++++ lms/envs/aws.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 20217deaff..339425fee5 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -92,6 +92,7 @@ LOG_DIR = ENV_TOKENS['LOG_DIR'] CACHES = ENV_TOKENS['CACHES'] SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') +SESSION_ENGINE = ENV_TOKENS.get('SESSION_ENGINE', SESSION_ENGINE) # 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 @@ -122,6 +123,10 @@ LOGGING = get_logger_config(LOG_DIR, debug=False, service_variant=SERVICE_VARIANT) +#theming start: +PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', 'edX') + + ################ SECURE AUTH ITEMS ############################### # Secret things: passwords, access keys, etc. with open(ENV_ROOT / CONFIG_PREFIX + "auth.json") as auth_file: diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 79178e27a3..2eb5814622 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -102,8 +102,8 @@ with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file: PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME) EMAIL_BACKEND = ENV_TOKENS.get('EMAIL_BACKEND', EMAIL_BACKEND) EMAIL_FILE_PATH = ENV_TOKENS.get('EMAIL_FILE_PATH', None) - SITE_NAME = ENV_TOKENS['SITE_NAME'] +SESSION_ENGINE = ENV_TOKENS.get('SESSION_ENGINE', SESSION_ENGINE) SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') # allow for environments to specify what cookie name our login subsystem should use