Merge remote-tracking branch 'origin/master' into nightly

kdmccormick · Oct 5, 2023 · 2ce2b74 · 2ce2b74
2 parents 3264542 + b3cde02
commit 2ce2b74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/changelog.d/20231004_114528_dave_fix_cms_base_settings.md b/changelog.d/20231004_114528_dave_fix_cms_base_settings.md
@@ -0,0 +1 @@
+- [Bugfix] Override CMS_BASE setting in Studio for the development environment. Without this, parts of Studio will try to use the devstack default of localhost:8010 instead. (by @ormsbee)
diff --git a/tutor/templates/apps/openedx/settings/cms/development.py b/tutor/templates/apps/openedx/settings/cms/development.py
@@ -5,6 +5,9 @@
 LMS_BASE = "{{ LMS_HOST }}:8000"
 LMS_ROOT_URL = "http://" + LMS_BASE
 
+CMS_BASE = "{{ CMS_HOST }}:8001"
+CMS_ROOT_URL = "http://" + CMS_BASE
+
 # Authentication
 SOCIAL_AUTH_EDX_OAUTH2_KEY = "{{ CMS_OAUTH2_KEY_SSO_DEV }}"
 SOCIAL_AUTH_EDX_OAUTH2_PUBLIC_URL_ROOT = LMS_ROOT_URL