Rename custom settings from "universal" to "tutor"

android/templates/edx.properties

@@ -1,3 +1,3 @@
 edx.android {
-    configFiles = ['universal.yaml']
+    configFiles = ['tutor.yaml']
 }

android/templates/tutor.yaml

@@ -1,5 +1,5 @@
 API_HOST_URL: '{{ "https" if ACTIVATE_HTTPS else "http" }}://{{ LMS_HOST }}'
-ENVIRONMENT_DISPLAY_NAME: 'universal'
+ENVIRONMENT_DISPLAY_NAME: 'tutor'
 PLATFORM_NAME: '{{ PLATFORM_NAME }}'
 PLATFORM_DESTINATION_NAME: '{{ LMS_HOST }}'
 FEEDBACK_EMAIL_ADDRESS: 'support@{{ LMS_HOST }}'

build/notes/Dockerfile

@@ -10,8 +10,8 @@ WORKDIR /openedx/edx-notes-api
 
 RUN pip install -r requirements/base.txt
 
-ENV DJANGO_SETTINGS_MODULE notesserver.settings.universal
-RUN ln -s /openedx/config/universal.py notesserver/settings/universal.py
+ENV DJANGO_SETTINGS_MODULE notesserver.settings.tutor
+RUN ln -s /openedx/config/tutor.py notesserver/settings/tutor.py
 
 EXPOSE 8000
 CMD gunicorn --name notes --bind=0.0.0.0:8000 --max-requests=1000 notesserver.wsgi:application

build/openedx/Dockerfile

@@ -62,15 +62,15 @@ RUN touch /openedx/requirements/private.txt \
 # Link configuration files to common /openedx/config folder, which should later
 # be mounted as a volume. Note that this image will not be functional until
 # config files have been mounted inside the container
-RUN mkdir -p /openedx/env/universal/lms /openedx/env/universal/cms \
-    && ln -s /openedx/env/universal/lms/ /openedx/edx-platform/lms/envs/universal \
-    && ln -s /openedx/env/universal/cms/ /openedx/edx-platform/cms/envs/universal \
+RUN mkdir -p /openedx/env/tutor/lms /openedx/env/tutor/cms \
+    && ln -s /openedx/env/tutor/lms/ /openedx/edx-platform/lms/envs/tutor \
+    && ln -s /openedx/env/tutor/cms/ /openedx/edx-platform/cms/envs/tutor \
     && ln -s /openedx/env/lms.env.json /openedx/ \
     && ln -s /openedx/env/cms.env.json /openedx/ \
     && ln -s /openedx/env/lms.auth.json /openedx/ \
     && ln -s /openedx/env/cms.auth.json /openedx/
-COPY settings/lms/*.py /openedx/env/universal/lms/
-COPY settings/cms/*.py /openedx/env/universal/cms/
+COPY settings/lms/*.py /openedx/env/tutor/lms/
+COPY settings/cms/*.py /openedx/env/tutor/cms/
 
 # Copy scripts
 COPY ./bin /openedx/bin
@@ -89,11 +89,11 @@ RUN openedx-assets xmodule \
     && openedx-assets common
 COPY ./themes/ /openedx/themes/
 RUN openedx-assets themes \
-    && openedx-assets collect --settings=universal.assets
+    && openedx-assets collect --settings=tutor.assets
 
 # service variant is "lms" or "cms"
 ENV SERVICE_VARIANT lms
-ENV SETTINGS universal.production
+ENV SETTINGS tutor.production
 
 # Entrypoint will fix permissions of all files and run commands as openedx
 ENTRYPOINT ["docker-entrypoint.sh"]

build/xqueue/Dockerfile

@@ -10,8 +10,8 @@ WORKDIR /openedx/xqueue
 
 RUN pip install -r requirements.txt
 
-ENV DJANGO_SETTINGS_MODULE xqueue.universal
-RUN ln -s /openedx/config/universal.py xqueue/universal.py
+ENV DJANGO_SETTINGS_MODULE xqueue.tutor
+RUN ln -s /openedx/config/tutor.py xqueue/tutor.py
 
 EXPOSE 8040
 CMD gunicorn --name xqueue --bind=0.0.0.0:8040 --max-requests=1000 xqueue.wsgi:application

deploy/singleserver/Makefile

@@ -3,7 +3,7 @@
 
 PWD = $$(pwd)
 USERID ?= $$(id -u)
-EDX_PLATFORM_SETTINGS ?= universal.production
+EDX_PLATFORM_SETTINGS ?= tutor.production
 -include $(PWD)/Makefile.env
 
 DOCKER_COMPOSE_RUN = docker-compose run --rm

deploy/templates/xqueue/tutor.py

@@ -13,7 +13,7 @@ DATABASES = {
 
 LOGGING = get_logger_config(
     log_dir="/openedx/data/",
-    logging_env="universal",
+    logging_env="tutor",
     dev_env=True,
 )
 

docs/dev.rst

@@ -7,7 +7,7 @@ In addition to running Open edX in production, you can use the docker containers
 
 To begin with, define development settings::
 
-    export EDX_PLATFORM_SETTINGS=universal.development
+    export EDX_PLATFORM_SETTINGS=tutor.development
 
 Run a local webserver
 ---------------------
@@ -40,12 +40,12 @@ All development commands will then automatically mount your local repo. For inst
 
 Note: containers are built on the Hawthorn release. If you are working on a different version of Open edX, you will have to rebuild the images with the right ``EDX_PLATFORM_VERSION`` argument. You may also want to change the ``EDX_PLATFORM_REPOSITORY`` argument to point to your own fork of edx-platform.
 
-With a customised edx-platform repo, you must be careful to have settings that are compatible with the docker environment. You are encouraged to copy the ``universal.development`` settings files to our own repo:
+With a customised edx-platform repo, you must be careful to have settings that are compatible with the docker environment. You are encouraged to copy the ``tutor.development`` settings files to our own repo:
 
-    cp -r config/openedx/universal/lms/ /path/to/edx-platform/lms/envs/universal
-    cp -r config/openedx/universal/cms/ /path/to/edx-platform/cms/envs/universal
+    cp -r config/openedx/tutor/lms/ /path/to/edx-platform/lms/envs/tutor
+    cp -r config/openedx/tutor/cms/ /path/to/edx-platform/cms/envs/tutor
 
-You can then run your platform with the ``universal.development`` settings.
+You can then run your platform with the ``tutor.development`` settings.
 
 Develop customised themes
 -------------------------