diff --git a/CHANGELOG.md b/CHANGELOG.md index 446e592..7761db4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥". ## Unreleased +- [Improvement] Add missing cms/lms production/development setting patches - [Improvement] Allow SigV4 authentication for video upload to S3 - [Bugfix] Fix cms development settings diff --git a/tutor/templates/apps/openedx/settings/cms/development.py b/tutor/templates/apps/openedx/settings/cms/development.py index a2f690c..070b984 100644 --- a/tutor/templates/apps/openedx/settings/cms/development.py +++ b/tutor/templates/apps/openedx/settings/cms/development.py @@ -5,3 +5,5 @@ from cms.envs.devstack import * # Setup correct webpack configuration file for development WEBPACK_CONFIG_PATH = "webpack.dev.config.js" + +{{ patch("openedx-cms-development-settings") }} \ No newline at end of file diff --git a/tutor/templates/apps/openedx/settings/cms/production.py b/tutor/templates/apps/openedx/settings/cms/production.py index cc96ade..869e665 100644 --- a/tutor/templates/apps/openedx/settings/cms/production.py +++ b/tutor/templates/apps/openedx/settings/cms/production.py @@ -10,3 +10,5 @@ ALLOWED_HOSTS = [ "localhost", "studio.localhost", ] + +{{ patch("openedx-cms-production-settings") }} diff --git a/tutor/templates/apps/openedx/settings/lms/development.py b/tutor/templates/apps/openedx/settings/lms/development.py index 0f36aad..468c73f 100644 --- a/tutor/templates/apps/openedx/settings/lms/development.py +++ b/tutor/templates/apps/openedx/settings/lms/development.py @@ -5,3 +5,5 @@ from lms.envs.devstack import * # Setup correct webpack configuration file for development WEBPACK_CONFIG_PATH = "webpack.dev.config.js" + +{{ patch("openedx-lms-development-settings") }} diff --git a/tutor/templates/apps/openedx/settings/lms/production.py b/tutor/templates/apps/openedx/settings/lms/production.py index 1aeaaa6..25ed9af 100644 --- a/tutor/templates/apps/openedx/settings/lms/production.py +++ b/tutor/templates/apps/openedx/settings/lms/production.py @@ -17,3 +17,5 @@ SEARCH_SKIP_ENROLLMENT_START_DATE_FILTERING = True # Allow insecure oauth2 for local interaction with local containers OAUTH_ENFORCE_SECURE = False + +{{ patch("openedx-lms-production-settings") }} diff --git a/tutor/templates/apps/openedx/settings/partials/common_all.py b/tutor/templates/apps/openedx/settings/partials/common_all.py index 3cd23c3..3193d4f 100644 --- a/tutor/templates/apps/openedx/settings/partials/common_all.py +++ b/tutor/templates/apps/openedx/settings/partials/common_all.py @@ -1,3 +1,5 @@ +####### Settings common to LMS and CMS + DEFAULT_FROM_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] SERVER_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] @@ -10,3 +12,6 @@ PAYMENT_SUPPORT_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] BULK_EMAIL_DEFAULT_FROM_EMAIL = "no-reply@" + ENV_TOKENS["LMS_BASE"] API_ACCESS_MANAGER_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] API_ACCESS_FROM_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] + +{{ patch("openedx-common-settings") }} +######## End of settings common to LMS and CMS \ No newline at end of file diff --git a/tutor/templates/apps/openedx/settings/partials/common_cms.py b/tutor/templates/apps/openedx/settings/partials/common_cms.py index bc534a4..283012c 100644 --- a/tutor/templates/apps/openedx/settings/partials/common_cms.py +++ b/tutor/templates/apps/openedx/settings/partials/common_cms.py @@ -37,7 +37,6 @@ for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE]: if not os.path.exists(folder): os.makedirs(folder) -{{ patch("openedx-common-settings") }} {{ patch("openedx-cms-common-settings") }} ######## End of common CMS settings \ No newline at end of file diff --git a/tutor/templates/apps/openedx/settings/partials/common_lms.py b/tutor/templates/apps/openedx/settings/partials/common_lms.py index 49b6933..5e7ae9f 100644 --- a/tutor/templates/apps/openedx/settings/partials/common_lms.py +++ b/tutor/templates/apps/openedx/settings/partials/common_lms.py @@ -60,7 +60,6 @@ for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE, ORA2_FILEUPLOAD_ROOT]: if not os.path.exists(folder): os.makedirs(folder) -{{ patch("openedx-common-settings") }} {{ patch("openedx-lms-common-settings") }} ######## End of common LMS settings \ No newline at end of file