diff --git a/tutordiscovery/patches/local-docker-compose-dev-services b/tutordiscovery/patches/local-docker-compose-dev-services new file mode 100644 index 0000000..503c095 --- /dev/null +++ b/tutordiscovery/patches/local-docker-compose-dev-services @@ -0,0 +1,4 @@ +discovery: + environment: + DJANGO_SETTINGS_MODULE: course_discovery.settings.tutor.development + command: ./manage.py runserver 0.0.0.0:8000 \ No newline at end of file diff --git a/tutordiscovery/patches/local-docker-compose-services b/tutordiscovery/patches/local-docker-compose-services index 0f50200..02f26c5 100644 --- a/tutordiscovery/patches/local-docker-compose-services +++ b/tutordiscovery/patches/local-docker-compose-services @@ -1,10 +1,10 @@ discovery: image: {{ DOCKER_REGISTRY }}{{ DISCOVERY_DOCKER_IMAGE }} environment: - DJANGO_SETTINGS_MODULE: course_discovery.settings.tutor + DJANGO_SETTINGS_MODULE: course_discovery.settings.tutor.production restart: unless-stopped volumes: - - ../plugins/discovery/apps/settings/tutor.py:/openedx/discovery/course_discovery/settings/tutor.py:ro + - ../plugins/discovery/apps/settings/tutor:/openedx/discovery/course_discovery/settings/tutor:ro - ../../data/discovery/media:/openedx/discovery/course_discovery/media depends_on: - mysql diff --git a/tutordiscovery/templates/discovery/apps/settings/tutor.py b/tutordiscovery/templates/discovery/apps/settings/partials/common.py similarity index 96% rename from tutordiscovery/templates/discovery/apps/settings/tutor.py rename to tutordiscovery/templates/discovery/apps/settings/partials/common.py index e793dd5..fba5f8b 100644 --- a/tutordiscovery/templates/discovery/apps/settings/tutor.py +++ b/tutordiscovery/templates/discovery/apps/settings/partials/common.py @@ -1,5 +1,3 @@ -from .production import * - SECRET_KEY = "{{ DISCOVERY_SECRET_KEY }}" ALLOWED_HOSTS = [ "localhost", @@ -77,6 +75,4 @@ EDX_DRF_EXTENSIONS = { 'OAUTH2_USER_INFO_URL': '{% if ACTIVATE_HTTPS %}https{% else %}http{% endif %}://{{ LMS_HOST }}/oauth2/user_info', } -STATIC_ROOT = "/openedx/static" -COMPRESS_ENABLED = True -COMPRESS_OFFLINE = True +STATIC_ROOT = "/openedx/static" \ No newline at end of file diff --git a/tutordiscovery/templates/discovery/apps/settings/tutor/__init__.py b/tutordiscovery/templates/discovery/apps/settings/tutor/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tutordiscovery/templates/discovery/apps/settings/tutor/development.py b/tutordiscovery/templates/discovery/apps/settings/tutor/development.py new file mode 100644 index 0000000..cf79709 --- /dev/null +++ b/tutordiscovery/templates/discovery/apps/settings/tutor/development.py @@ -0,0 +1,3 @@ +from ..devstack import * + +{% include "discovery/apps/settings/partials/common.py" %} diff --git a/tutordiscovery/templates/discovery/apps/settings/tutor/production.py b/tutordiscovery/templates/discovery/apps/settings/tutor/production.py new file mode 100644 index 0000000..8f2c460 --- /dev/null +++ b/tutordiscovery/templates/discovery/apps/settings/tutor/production.py @@ -0,0 +1,6 @@ +from ..production import * + +{% include "discovery/apps/settings/partials/common.py" %} + +COMPRESS_ENABLED = True +COMPRESS_OFFLINE = True