Merge remote-tracking branch 'origin/master' into nightly
This commit is contained in:
commit
2ce2b748b8
|
@ -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)
|
|
@ -5,6 +5,9 @@ from cms.envs.devstack import *
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue