christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2025-01-25 22:18:24 +00:00
Code Issues Releases Activity

Rename *_PROTOCOL to *_SCHEME

Browse Source
This commit is contained in:
Régis Behmo 2020-03-12 09:37:22 +01:00
parent 00ec6930ae
commit 16819bd697
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/configuration.rst
View File

@ -113,7 +113,7 @@ By default, a running Open edX platform deployed with Tutor includes all necessa
Elasticsearch Elasticsearch
************* *************
- ``ELASTICSEARCH_PROTOCOL`` (default: ``"http"``) - ``ELASTICSEARCH_SCHEME`` (default: ``"http"``)
- ``ELASTICSEARCH_HOST`` (default: ``"elasticsearch"``) - ``ELASTICSEARCH_HOST`` (default: ``"elasticsearch"``)
- ``ELASTICSEARCH_PORT`` (default: ``9200``) - ``ELASTICSEARCH_PORT`` (default: ``9200``)
- ``ELASTICSEARCH_HEAP_SIZE`` (default: ``"1g"``) - ``ELASTICSEARCH_HEAP_SIZE`` (default: ``"1g"``)

2
tutor/templates/apps/openedx/config/cms.env.json
View File

@ -26,7 +26,7 @@
"COMPREHENSIVE_THEME_DIRS": ["/openedx/themes"], "COMPREHENSIVE_THEME_DIRS": ["/openedx/themes"],
"STATIC_ROOT_BASE": "/openedx/staticfiles", "STATIC_ROOT_BASE": "/openedx/staticfiles",
"ELASTIC_SEARCH_CONFIG": [{ "ELASTIC_SEARCH_CONFIG": [{
{% if ELASTICSEARCH_PROTOCOL == "https" %}"use_ssl": true,{% endif %} {% if ELASTICSEARCH_SCHEME == "https" %}"use_ssl": true,{% endif %}
"host": "{{ ELASTICSEARCH_HOST }}", "host": "{{ ELASTICSEARCH_HOST }}",
"port": {{ ELASTICSEARCH_PORT }} "port": {{ ELASTICSEARCH_PORT }}
}], }],

2
tutor/templates/apps/openedx/config/lms.env.json
View File

@ -32,7 +32,7 @@
"COMPREHENSIVE_THEME_DIRS": ["/openedx/themes"], "COMPREHENSIVE_THEME_DIRS": ["/openedx/themes"],
"STATIC_ROOT_BASE": "/openedx/staticfiles", "STATIC_ROOT_BASE": "/openedx/staticfiles",
"ELASTIC_SEARCH_CONFIG": [{ "ELASTIC_SEARCH_CONFIG": [{
{% if ELASTICSEARCH_PROTOCOL == "https" %}"use_ssl": true,{% endif %} {% if ELASTICSEARCH_SCHEME == "https" %}"use_ssl": true,{% endif %}
"host": "{{ ELASTICSEARCH_HOST }}", "host": "{{ ELASTICSEARCH_HOST }}",
"port": {{ ELASTICSEARCH_PORT }} "port": {{ ELASTICSEARCH_PORT }}
}], }],

2
tutor/templates/config.yml
View File

@ -43,7 +43,7 @@ DOCKER_REGISTRY: "docker.io/"
LOCAL_PROJECT_NAME: "tutor_local" LOCAL_PROJECT_NAME: "tutor_local"
ELASTICSEARCH_HOST: "elasticsearch" ELASTICSEARCH_HOST: "elasticsearch"
ELASTICSEARCH_PORT: 9200 ELASTICSEARCH_PORT: 9200
ELASTICSEARCH_PROTOCOL: "http" ELASTICSEARCH_SCHEME: "http"
ELASTICSEARCH_HEAP_SIZE: 1g ELASTICSEARCH_HEAP_SIZE: 1g
FORUM_HOST: "forum" FORUM_HOST: "forum"
JWT_COMMON_AUDIENCE: "openedx" JWT_COMMON_AUDIENCE: "openedx"

2
tutor/templates/k8s/deployments.yml
View File

@ -108,7 +108,7 @@ spec:
- containerPort: 4567 - containerPort: 4567
env: env:
- name: SEARCH_SERVER - name: SEARCH_SERVER
value: "{{ ELASTICSEARCH_PROTOCOL }}://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}" value: "{{ ELASTICSEARCH_SCHEME }}://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}"
- name: MONGODB_AUTH - name: MONGODB_AUTH
value: "{% if MONGODB_USERNAME and MONGODB_PASSWORD %}{{ MONGODB_USERNAME}}:{{ MONGODB_PASSWORD }}@{% endif %}" value: "{% if MONGODB_USERNAME and MONGODB_PASSWORD %}{{ MONGODB_USERNAME}}:{{ MONGODB_PASSWORD }}@{% endif %}"
- name: MONGODB_HOST - name: MONGODB_HOST

2
tutor/templates/local/docker-compose.yml
View File

@ -88,7 +88,7 @@ services:
forum: forum:
image: {{ DOCKER_REGISTRY }}{{ DOCKER_IMAGE_FORUM }} image: {{ DOCKER_REGISTRY }}{{ DOCKER_IMAGE_FORUM }}
environment: environment:
SEARCH_SERVER: "{{ ELASTICSEARCH_PROTOCOL }}://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}" SEARCH_SERVER: "{{ ELASTICSEARCH_SCHEME }}://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}"
MONGODB_AUTH: "{% if MONGODB_USERNAME and MONGODB_PASSWORD %}{{ MONGODB_USERNAME}}:{{ MONGODB_PASSWORD }}@{% endif %}" MONGODB_AUTH: "{% if MONGODB_USERNAME and MONGODB_PASSWORD %}{{ MONGODB_USERNAME}}:{{ MONGODB_PASSWORD }}@{% endif %}"
MONGODB_HOST: "{{ MONGODB_HOST }}" MONGODB_HOST: "{{ MONGODB_HOST }}"
MONGODB_PORT: "{{ MONGODB_PORT }}" MONGODB_PORT: "{{ MONGODB_PORT }}"