fix: Make MEDIA_ROOT and DATA_DIR overridable.

The two settings were previously hardcoded in the lms and openedx
common.py making it hard to make reasonable defaults using the ENV_ROOT
setting.

Author: feanil

lms/envs/common.py

@@ -745,6 +745,7 @@
 ENV_ROOT = REPO_ROOT.dirname()  # virtualenv dir /edx-platform is in
 COURSES_ROOT = ENV_ROOT / "data"
 NODE_MODULES_ROOT = REPO_ROOT / "node_modules"
+MEDIA_ROOT = ENV_ROOT / "media_root"
 
 DATA_DIR = COURSES_ROOT
 
@@ -936,8 +937,6 @@
 
 ALTERNATE_WORKER_QUEUES = 'cms'
 
-DATA_DIR = '/edx/var/edxapp/data'
-
 # .. setting_name: MAINTENANCE_BANNER_TEXT
 # .. setting_default: None
 # .. setting_description: Specifies the text that is rendered on the maintenance banner.

lms/envs/development.py

@@ -77,8 +77,11 @@
 SESSION_COOKIE_DOMAIN = '.local.openedx.io'
 
 # MFE Development URLs
+# This one needs a trailing slash to load correctly right now.
 LEARNER_HOME_MICROFRONTEND_URL = 'http://apps.local.openedx.io:1996/learner-dashboard/'
-LEARNING_MICROFRONTEND_URL = "http://apps.local.openedx.io:2000/learning/"
+# This one explicitly needs to not have a trailing slash because of how it's used to make other
+# urls.
+LEARNING_MICROFRONTEND_URL = "http://apps.local.openedx.io:2000/learning"
 
 #######################################################################################################################
 #### DERIVE ANY DERIVED SETTINGS

lms/envs/production.py

@@ -37,6 +37,9 @@
 # A proxy for feature flags stored in the settings namespace
 FEATURES = FeaturesProxy(globals())
 
+# Settings moved from common.py
+DATA_DIR = '/edx/var/edxapp/data'
+MEDIA_ROOT = '/edx/var/edxapp/media/'
 
 def get_env_setting(setting):
     """ Get the environment setting or return exception """

openedx/envs/common.py

@@ -96,7 +96,6 @@ def _make_locale_paths(settings):
 USE_TZ = True
 
 # User-uploaded content
-MEDIA_ROOT = '/edx/var/edxapp/media/'
 MEDIA_URL = '/media/'
 
 # Dummy secret key for dev/test
@@ -1304,7 +1303,7 @@ def _make_locale_paths(settings):
     # STORAGE_CLASS='storages.backends.s3boto3.S3Boto3Storage',
     # STORAGE_KWARGS=dict(bucket='video-image-bucket'),
     STORAGE_KWARGS=dict(
-        location=MEDIA_ROOT,
+        location=Derived(lambda settings: settings.MEDIA_ROOT),
     ),
     DIRECTORY_PREFIX='video-images/',
     BASE_URL=MEDIA_URL,
@@ -1321,7 +1320,7 @@ def _make_locale_paths(settings):
     # STORAGE_CLASS='storages.backends.s3boto3.S3Boto3Storage',
     # STORAGE_KWARGS=dict(bucket='video-transcripts-bucket'),
     STORAGE_KWARGS=dict(
-        location=MEDIA_ROOT,
+        location=Derived(lambda settings: settings.MEDIA_ROOT),
     ),
     DIRECTORY_PREFIX='video-transcripts/',
     BASE_URL=MEDIA_URL,
@@ -1611,7 +1610,7 @@ def _make_locale_paths(settings):
 PROFILE_IMAGE_BACKEND = {
     'class': 'openedx.core.storage.OverwriteStorage',
     'options': {
-        'location': os.path.join(MEDIA_ROOT, 'profile-images/'),
+        'location': Derived(lambda settings: os.path.join(settings.MEDIA_ROOT, 'profile-images/')),
         'base_url': os.path.join(MEDIA_URL, 'profile-images/'),
     },
 }