christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-12-12 14:17:46 +00:00
Code Issues Releases Activity

Add missing cms/lms production/development setting patches

Browse Source
This commit is contained in:
Régis Behmo 2019-10-18 18:01:12 +02:00
parent 9cc4074f53
commit 38ed7d4985
8 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥".
## Unreleased ## Unreleased
- [Improvement] Add missing cms/lms production/development setting patches
- [Improvement] Allow SigV4 authentication for video upload to S3 - [Improvement] Allow SigV4 authentication for video upload to S3
- [Bugfix] Fix cms development settings - [Bugfix] Fix cms development settings

2
tutor/templates/apps/openedx/settings/cms/development.py
View File

@ -5,3 +5,5 @@ from cms.envs.devstack import *
# Setup correct webpack configuration file for development # Setup correct webpack configuration file for development
WEBPACK_CONFIG_PATH = "webpack.dev.config.js" WEBPACK_CONFIG_PATH = "webpack.dev.config.js"
{{ patch("openedx-cms-development-settings") }}

2
tutor/templates/apps/openedx/settings/cms/production.py
View File

@ -10,3 +10,5 @@ ALLOWED_HOSTS = [
"localhost", "localhost",
"studio.localhost", "studio.localhost",
] ]
{{ patch("openedx-cms-production-settings") }}

2
tutor/templates/apps/openedx/settings/lms/development.py
View File

@ -5,3 +5,5 @@ from lms.envs.devstack import *
# Setup correct webpack configuration file for development # Setup correct webpack configuration file for development
WEBPACK_CONFIG_PATH = "webpack.dev.config.js" WEBPACK_CONFIG_PATH = "webpack.dev.config.js"
{{ patch("openedx-lms-development-settings") }}

2
tutor/templates/apps/openedx/settings/lms/production.py
View File

@ -17,3 +17,5 @@ SEARCH_SKIP_ENROLLMENT_START_DATE_FILTERING = True
# Allow insecure oauth2 for local interaction with local containers # Allow insecure oauth2 for local interaction with local containers
OAUTH_ENFORCE_SECURE = False OAUTH_ENFORCE_SECURE = False
{{ patch("openedx-lms-production-settings") }}

5
tutor/templates/apps/openedx/settings/partials/common_all.py
View File

@ -1,3 +1,5 @@
####### Settings common to LMS and CMS
DEFAULT_FROM_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] DEFAULT_FROM_EMAIL = ENV_TOKENS["CONTACT_EMAIL"]
DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS["CONTACT_EMAIL"]
SERVER_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"] BULK_EMAIL_DEFAULT_FROM_EMAIL = "no-reply@" + ENV_TOKENS["LMS_BASE"]
API_ACCESS_MANAGER_EMAIL = ENV_TOKENS["CONTACT_EMAIL"] API_ACCESS_MANAGER_EMAIL = ENV_TOKENS["CONTACT_EMAIL"]
API_ACCESS_FROM_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

1
tutor/templates/apps/openedx/settings/partials/common_cms.py
View File

@ -37,7 +37,6 @@ for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE]:
if not os.path.exists(folder): if not os.path.exists(folder):
os.makedirs(folder) os.makedirs(folder)
{{ patch("openedx-common-settings") }}
{{ patch("openedx-cms-common-settings") }} {{ patch("openedx-cms-common-settings") }}
######## End of common CMS settings ######## End of common CMS settings

1
tutor/templates/apps/openedx/settings/partials/common_lms.py
View File

@ -60,7 +60,6 @@ for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE, ORA2_FILEUPLOAD_ROOT]:
if not os.path.exists(folder): if not os.path.exists(folder):
os.makedirs(folder) os.makedirs(folder)
{{ patch("openedx-common-settings") }}
{{ patch("openedx-lms-common-settings") }} {{ patch("openedx-lms-common-settings") }}
######## End of common LMS settings ######## End of common LMS settings