diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 35827bfac5..c37a36d02f 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -133,6 +133,7 @@ if 'loc_cache' not in CACHES: SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') SESSION_ENGINE = ENV_TOKENS.get('SESSION_ENGINE', SESSION_ENGINE) +SESSION_COOKIE_SECURE = ENV_TOKENS.get('SESSION_COOKIE_SECURE', SESSION_COOKIE_SECURE) # 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 diff --git a/cms/envs/common.py b/cms/envs/common.py index 428a84799a..3e1cfe2f71 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -269,6 +269,7 @@ MODULESTORE_BRANCH = 'draft-preferred' # Change DEBUG/TEMPLATE_DEBUG in your environment settings files, not here DEBUG = False TEMPLATE_DEBUG = False +SESSION_COOKIE_SECURE = False # Site info SITE_ID = 1 diff --git a/lms/envs/aws.py b/lms/envs/aws.py index c3b1463096..990803b41a 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -147,6 +147,7 @@ HTTPS = ENV_TOKENS.get('HTTPS', HTTPS) SESSION_ENGINE = ENV_TOKENS.get('SESSION_ENGINE', SESSION_ENGINE) SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') REGISTRATION_EXTRA_FIELDS = ENV_TOKENS.get('REGISTRATION_EXTRA_FIELDS', REGISTRATION_EXTRA_FIELDS) +SESSION_COOKIE_SECURE = ENV_TOKENS.get('SESSION_COOKIE_SECURE', SESSION_COOKIE_SECURE) CMS_BASE = ENV_TOKENS.get('CMS_BASE', 'studio.edx.org') diff --git a/lms/envs/common.py b/lms/envs/common.py index f6de15e02c..c5dea04781 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -644,6 +644,7 @@ COURSES_WITH_UNSAFE_CODE = [] DEBUG = False TEMPLATE_DEBUG = False USE_TZ = True +SESSION_COOKIE_SECURE = False # CMS base CMS_BASE = 'localhost:8001'