From 770b9f1f872674b280c88b50b4faa04e8d86f137 Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Mon, 17 Jun 2013 09:01:20 -0400 Subject: [PATCH 1/2] fixing segment io settings bug * Moving to the auth tokens section * Removing the feature flag logic since all features are loaded earlier ``` for feature, value in ENV_TOKENS.get('MITX_FEATURES', {}).items(): MITX_FEATURES[feature] = value ``` --- lms/envs/aws.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 73f49a6209..da1e9fb40f 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -172,18 +172,14 @@ for name, value in ENV_TOKENS.get("CODE_JAIL", {}).items(): COURSES_WITH_UNSAFE_CODE = ENV_TOKENS.get("COURSES_WITH_UNSAFE_CODE", []) -############### Mixed Related(Secure/Not-Secure) Items ########## -# If segment.io key specified, load it and turn on segment IO if the feature flag is set -SEGMENT_IO_LMS_KEY = AUTH_TOKENS.get('SEGMENT_IO_LMS_KEY') -if SEGMENT_IO_LMS_KEY: - MITX_FEATURES['SEGMENT_IO_LMS'] = ENV_TOKENS.get('SEGMENT_IO_LMS', False) - ############################## SECURE AUTH ITEMS ############### # Secret things: passwords, access keys, etc. with open(ENV_ROOT / CONFIG_PREFIX + "auth.json") as auth_file: AUTH_TOKENS = json.load(auth_file) +SEGMENT_IO_LMS_KEY = AUTH_TOKENS.get('SEGMENT_IO_LMS_KEY', None) + SECRET_KEY = AUTH_TOKENS['SECRET_KEY'] AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"] From ffeabae069cd88e136b6bbfa66d3e5a9d6becd4d Mon Sep 17 00:00:00 2001 From: John Jarvis Date: Mon, 17 Jun 2013 09:07:02 -0400 Subject: [PATCH 2/2] moving settings into the auth tokens section --- lms/envs/aws.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index da1e9fb40f..b9d3f58e8f 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -178,7 +178,12 @@ COURSES_WITH_UNSAFE_CODE = ENV_TOKENS.get("COURSES_WITH_UNSAFE_CODE", []) with open(ENV_ROOT / CONFIG_PREFIX + "auth.json") as auth_file: AUTH_TOKENS = json.load(auth_file) -SEGMENT_IO_LMS_KEY = AUTH_TOKENS.get('SEGMENT_IO_LMS_KEY', None) +############### Mixed Related(Secure/Not-Secure) Items ########## +# If segment.io key specified, load it and turn on segment IO if the feature flag is set +SEGMENT_IO_LMS_KEY = AUTH_TOKENS.get('SEGMENT_IO_LMS_KEY') +if SEGMENT_IO_LMS_KEY: + MITX_FEATURES['SEGMENT_IO_LMS'] = ENV_TOKENS.get('SEGMENT_IO_LMS', False) + SECRET_KEY = AUTH_TOKENS['SECRET_KEY']