From c2175423fea5d53c9ff889ed6d44e6198472fde4 Mon Sep 17 00:00:00 2001 From: Kevin Falcone Date: Wed, 16 Aug 2017 15:04:02 -0400 Subject: [PATCH] BOOK_URL hasn't been used since the 6.00 courses RSS_TIMEOUT was removed in e8ee29786fdfe2f39d780f0f64cc5592d19b0fb9 but missed in lms/envs --- cms/envs/bok_choy.env.json | 1 - cms/envs/bok_choy_docker.env.json | 1 - lms/envs/aws.py | 1 - lms/envs/bok_choy.env.json | 1 - lms/envs/bok_choy_docker.env.json | 1 - lms/envs/common.py | 5 ----- 6 files changed, 10 deletions(-) diff --git a/cms/envs/bok_choy.env.json b/cms/envs/bok_choy.env.json index 320e0cdcc0..69aa3de589 100644 --- a/cms/envs/bok_choy.env.json +++ b/cms/envs/bok_choy.env.json @@ -1,5 +1,4 @@ { - "BOOK_URL": "", "BUGS_EMAIL": "bugs@example.com", "BULK_EMAIL_DEFAULT_FROM_EMAIL": "no-reply@example.com", "CACHES": { diff --git a/cms/envs/bok_choy_docker.env.json b/cms/envs/bok_choy_docker.env.json index 77cd2e4318..9191f3eef7 100644 --- a/cms/envs/bok_choy_docker.env.json +++ b/cms/envs/bok_choy_docker.env.json @@ -1,5 +1,4 @@ { - "BOOK_URL": "", "BUGS_EMAIL": "bugs@example.com", "BULK_EMAIL_DEFAULT_FROM_EMAIL": "no-reply@example.com", "CACHES": { diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 69bbf05107..b83a195269 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -212,7 +212,6 @@ if ENV_TOKENS.get('SESSION_COOKIE_NAME', None): # NOTE, there's a bug in Django (http://bugs.python.org/issue18012) which necessitates this being a str() SESSION_COOKIE_NAME = str(ENV_TOKENS.get('SESSION_COOKIE_NAME')) -BOOK_URL = ENV_TOKENS['BOOK_URL'] LOG_DIR = ENV_TOKENS['LOG_DIR'] CACHES = ENV_TOKENS['CACHES'] diff --git a/lms/envs/bok_choy.env.json b/lms/envs/bok_choy.env.json index edf485341e..273e83dbf2 100644 --- a/lms/envs/bok_choy.env.json +++ b/lms/envs/bok_choy.env.json @@ -1,6 +1,5 @@ { "ANALYTICS_DASHBOARD_URL": "", - "BOOK_URL": "", "BUGS_EMAIL": "bugs@example.com", "BULK_EMAIL_DEFAULT_FROM_EMAIL": "no-reply@example.com", "CACHES": { diff --git a/lms/envs/bok_choy_docker.env.json b/lms/envs/bok_choy_docker.env.json index 137ebfa4aa..044a06027b 100644 --- a/lms/envs/bok_choy_docker.env.json +++ b/lms/envs/bok_choy_docker.env.json @@ -1,6 +1,5 @@ { "ANALYTICS_DASHBOARD_URL": "", - "BOOK_URL": "", "BUGS_EMAIL": "bugs@example.com", "BULK_EMAIL_DEFAULT_FROM_EMAIL": "no-reply@example.com", "CACHES": { diff --git a/lms/envs/common.py b/lms/envs/common.py index 3ac4004330..2f1fbaa732 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -591,11 +591,6 @@ AUTHENTICATION_BACKENDS = ( STUDENT_FILEUPLOAD_MAX_SIZE = 4 * 1000 * 1000 # 4 MB MAX_FILEUPLOADS_PER_INPUT = 20 -# Dev machines shouldn't need the book -# BOOK_URL = '/static/book/' -BOOK_URL = 'https://mitxstatic.s3.amazonaws.com/book_images/' # For AWS deploys -RSS_TIMEOUT = 600 - # Configuration option for when we want to grab server error pages STATIC_GRAB = False DEV_CONTENT = True