From f2ec7b50531446ec7cfad3b6179cccb2f5791f65 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Mon, 25 Apr 2022 10:48:35 -0400 Subject: [PATCH] chore: Cleanup last remenants of the edx-microsite code. (#30306) There are still references to the word `microsite` because the site-configuration code uses it to referr to it's sub-sites in a few places. --- cms/envs/common.py | 4 ---- cms/envs/devstack-experimental.yml | 2 -- docs/guides/docstrings/common_djangoapps.rst | 1 - lms/envs/common.py | 4 ---- lms/envs/devstack-experimental.yml | 2 -- openedx/core/djangoapps/theming/helpers.py | 3 +-- 6 files changed, 1 insertion(+), 15 deletions(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index 16f34a0845..d05ef07b6f 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -2530,10 +2530,6 @@ BLOCKSTORE_BUNDLE_CACHE_TIMEOUT = 3000 ###################### LEARNER PORTAL ################################ LEARNER_PORTAL_URL_ROOT = 'https://learner-portal-localhost:18000' -######################### MICROSITE ############################### -MICROSITE_ROOT_DIR = '/edx/app/edxapp/edx-microsite' -MICROSITE_CONFIGURATION = {} - ############################ JWT ################################# JWT_ISSUER = 'http://127.0.0.1:8000/oauth2' DEFAULT_JWT_ISSUER = { diff --git a/cms/envs/devstack-experimental.yml b/cms/envs/devstack-experimental.yml index 0ed383b825..d29c69e00d 100644 --- a/cms/envs/devstack-experimental.yml +++ b/cms/envs/devstack-experimental.yml @@ -352,8 +352,6 @@ LOG_DIR: /edx/var/log/edx MAINTENANCE_BANNER_TEXT: Sample banner message MEDIA_ROOT: /edx/var/edxapp/media/ MEDIA_URL: /media/ -MICROSITE_CONFIGURATION: {} -MICROSITE_ROOT_DIR: /edx/app/edxapp/edx-microsite MKTG_URLS: {} MKTG_URL_LINK_MAP: {} MOBILE_STORE_URLS: {} diff --git a/docs/guides/docstrings/common_djangoapps.rst b/docs/guides/docstrings/common_djangoapps.rst index b10d78d87e..864e1d1129 100644 --- a/docs/guides/docstrings/common_djangoapps.rst +++ b/docs/guides/docstrings/common_djangoapps.rst @@ -13,7 +13,6 @@ LMS and Studio. common/djangoapps/edxmako/modules common/djangoapps/enrollment/modules common/djangoapps/entitlements/modules - common/djangoapps/microsite_configuration/modules common/djangoapps/pipeline_mako/modules common/djangoapps/static_replace/modules common/djangoapps/status/modules diff --git a/lms/envs/common.py b/lms/envs/common.py index da7fd16b2c..09579051bc 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -5039,10 +5039,6 @@ BUNDLE_ASSET_STORAGE_SETTINGS = dict( ), ) -######################### MICROSITE ############################### -MICROSITE_ROOT_DIR = '/edx/app/edxapp/edx-microsite' -MICROSITE_CONFIGURATION = {} - SYSLOG_SERVER = '' FEEDBACK_SUBMISSION_EMAIL = '' GITHUB_REPO_ROOT = '/edx/var/edxapp/data' diff --git a/lms/envs/devstack-experimental.yml b/lms/envs/devstack-experimental.yml index 16aa92440f..d4975b9b99 100644 --- a/lms/envs/devstack-experimental.yml +++ b/lms/envs/devstack-experimental.yml @@ -393,8 +393,6 @@ MAILCHIMP_NEW_USER_LIST_ID: null MAINTENANCE_BANNER_TEXT: Sample banner message MEDIA_ROOT: /edx/var/edxapp/media/ MEDIA_URL: /media/ -MICROSITE_CONFIGURATION: {} -MICROSITE_ROOT_DIR: /edx/app/edxapp/edx-microsite MKTG_URLS: {} MKTG_URL_LINK_MAP: {} MOBILE_STORE_URLS: {} diff --git a/openedx/core/djangoapps/theming/helpers.py b/openedx/core/djangoapps/theming/helpers.py index 7b6745846e..33f709485b 100644 --- a/openedx/core/djangoapps/theming/helpers.py +++ b/openedx/core/djangoapps/theming/helpers.py @@ -37,9 +37,8 @@ def get_template_path(relative_path, **kwargs): # lint-amnesty, pylint: disable def is_request_in_themed_site(): """ - This is a proxy function to hide microsite_configuration behind comprehensive theming. + This is a proxy function to site_configuration. """ - # We need to give priority to theming/site-configuration over microsites return configuration_helpers.is_site_configuration_enabled()