6
0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-07 16:04:02 +00:00

Make it easy for users to override production settings

Close #131.
This commit is contained in:
Régis Behmo 2019-01-20 09:23:43 +01:00
parent 924b156b52
commit 6d70dedce0
3 changed files with 15 additions and 0 deletions

View File

@ -1,5 +1,6 @@
# Changelog # Changelog
- 2019-01-20 [Improvement] Make it easy to load custom settings for the local production install
- 2019-01-16 [Improvement] Switch license from MIT to AGPL - 2019-01-16 [Improvement] Switch license from MIT to AGPL
- 2019-01-04 [Bugfix] Fix xqueue consumer command - 2019-01-04 [Bugfix] Fix xqueue consumer command
- 2018-12-26 [Improvement] Upgrade nodejs to 5.5.1 - 2018-12-26 [Improvement] Upgrade nodejs to 5.5.1

View File

@ -84,6 +84,7 @@ services:
image: ${OPENEDX_DOCKER_IMAGE:-regis/openedx:hawthorn} image: ${OPENEDX_DOCKER_IMAGE:-regis/openedx:hawthorn}
environment: environment:
SERVICE_VARIANT: lms SERVICE_VARIANT: lms
SETTINGS: ${EDX_PLATFORM_SETTINGS:-tutor.production}
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ../env/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/ - ../env/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/
@ -103,6 +104,7 @@ services:
image: ${OPENEDX_DOCKER_IMAGE:-regis/openedx:hawthorn} image: ${OPENEDX_DOCKER_IMAGE:-regis/openedx:hawthorn}
environment: environment:
SERVICE_VARIANT: cms SERVICE_VARIANT: cms
SETTINGS: ${EDX_PLATFORM_SETTINGS:-tutor.production}
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ../env/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/ - ../env/openedx/settings/lms/:/openedx/edx-platform/lms/envs/tutor/
@ -123,6 +125,7 @@ services:
image: ${OPENEDX_DOCKER_IMAGE:-regis/openedx:hawthorn} image: ${OPENEDX_DOCKER_IMAGE:-regis/openedx:hawthorn}
environment: environment:
SERVICE_VARIANT: lms SERVICE_VARIANT: lms
SETTINGS: ${EDX_PLATFORM_SETTINGS:-tutor.production}
C_FORCE_ROOT: "1" # run celery tasks as root #nofear C_FORCE_ROOT: "1" # run celery tasks as root #nofear
command: ./manage.py lms celery worker --loglevel=info --hostname=edx.lms.core.default.%%h --maxtasksperchild 100 command: ./manage.py lms celery worker --loglevel=info --hostname=edx.lms.core.default.%%h --maxtasksperchild 100
restart: unless-stopped restart: unless-stopped
@ -138,6 +141,7 @@ services:
image: ${OPENEDX_DOCKER_IMAGE:-regis/openedx:hawthorn} image: ${OPENEDX_DOCKER_IMAGE:-regis/openedx:hawthorn}
environment: environment:
SERVICE_VARIANT: cms SERVICE_VARIANT: cms
SETTINGS: ${EDX_PLATFORM_SETTINGS:-tutor.production}
C_FORCE_ROOT: "1" # run celery tasks as root #nofear C_FORCE_ROOT: "1" # run celery tasks as root #nofear
command: ./manage.py cms celery worker --loglevel=info --hostname=edx.cms.core.default.%%h --maxtasksperchild 100 command: ./manage.py cms celery worker --loglevel=info --hostname=edx.cms.core.default.%%h --maxtasksperchild 100
restart: unless-stopped restart: unless-stopped

View File

@ -103,6 +103,16 @@ After launching your platfom, the web UI will be available at `http://localhost:
Among many other things, you'll be able to view the logs for each container, which is really useful. Among many other things, you'll be able to view the logs for each container, which is really useful.
Loading different production settings for ``edx-platform``
----------------------------------------------------------
The default settings module loaded by ``edx-platform`` is ``tutor.production``. The folders ``tutor/deploy/env/openedx/settings/lms`` and ``tutor/deploy/env/openedx/settings/cms`` are mounted as ``edx-platform/lms/envs/tutor`` and ``edx-platform/cms/envs/tutor`` inside the docker containers. Thus, to use your own settings, you must do two things:
1. Copy your settings files for the lms and the cms to ``tutor/deploy/env/openedx/settings/lms/mysettings.py`` and ``tutor/deploy/env/openedx/settings/cms/mysettings.py``.
2. Load your settings by adding ``EDX_PLATFORM_SETTINGS=tutor.mysettings`` to ``tutor/deploy/local/.env``.
Of course, your settings should be compatible with the docker install. You can get some inspiration from the ``production.py`` settings modules generated by Tutor.
Additional commands Additional commands
------------------- -------------------