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

Configurable Rabbitmq authentication

Browse Source
This commit is contained in:
Régis Behmo 2019-03-20 19:02:39 +01:00
parent 0a02d65760
commit e35efa3302
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,7 +2,7 @@
## Latest ## Latest
- [Improvement] Add configurable SMTP authentication - [Improvement] Add configurable SMTP and Rabbitmq authentication
- [Improvement] Harmonize mysql username/password configuration parameters - [Improvement] Harmonize mysql username/password configuration parameters
- [Feature] Configurable and pluggable data storage backends (#114) - [Feature] Configurable and pluggable data storage backends (#114)

2
docs/configuration.rst
View File

@ -92,6 +92,8 @@ Rabbitmq
~~~~~~~~ ~~~~~~~~
- ``RABBITMQ_HOST`` (default: ``"rabbitmq"``) - ``RABBITMQ_HOST`` (default: ``"rabbitmq"``)
- ``RABBITMQ_USERNAME`` (default: ``""``)
- ``RABBITMQ_PASSWORD`` (default: ``""``)
SMTP SMTP
~~~~ ~~~~

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

@ -16,8 +16,10 @@
"CMS_BASE": "{{ CMS_HOST }}", "CMS_BASE": "{{ CMS_HOST }}",
"LMS_BASE": "{{ LMS_HOST }}", "LMS_BASE": "{{ LMS_HOST }}",
"CONTACT_EMAIL": "{{ CONTACT_EMAIL }}", "CONTACT_EMAIL": "{{ CONTACT_EMAIL }}",
"CELERY_BROKER_HOSTNAME": "{{ RABBITMQ_HOST }}",
"CELERY_BROKER_TRANSPORT": "amqp", "CELERY_BROKER_TRANSPORT": "amqp",
"CELERY_BROKER_HOSTNAME": "{{ RABBITMQ_HOST }}",
"CELERY_BROKER_USER": "{{ RABBITMQ_USERNAME }}",
"CELERY_BROKER_PASSWORD": "{{ RABBITMQ_PASSWORD }}",
"COMPREHENSIVE_THEME_DIRS": ["/openedx/themes"], "COMPREHENSIVE_THEME_DIRS": ["/openedx/themes"],
"MEDIA_ROOT": "/openedx/data/uploads/", "MEDIA_ROOT": "/openedx/data/uploads/",
"STATIC_ROOT_BASE": "/openedx/staticfiles", "STATIC_ROOT_BASE": "/openedx/staticfiles",

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

@ -21,8 +21,10 @@
"CMS_BASE": "{{ CMS_HOST }}", "CMS_BASE": "{{ CMS_HOST }}",
"LMS_BASE": "{{ LMS_HOST }}", "LMS_BASE": "{{ LMS_HOST }}",
"CONTACT_EMAIL": "{{ CONTACT_EMAIL }}", "CONTACT_EMAIL": "{{ CONTACT_EMAIL }}",
"CELERY_BROKER_HOSTNAME": "{{ RABBITMQ_HOST }}",
"CELERY_BROKER_TRANSPORT": "amqp", "CELERY_BROKER_TRANSPORT": "amqp",
"CELERY_BROKER_HOSTNAME": "{{ RABBITMQ_HOST }}",
"CELERY_BROKER_USER": "{{ RABBITMQ_USERNAME }}",
"CELERY_BROKER_PASSWORD": "{{ RABBITMQ_PASSWORD }}",
"COMMENTS_SERVICE_URL": "http://forum:4567", "COMMENTS_SERVICE_URL": "http://forum:4567",
"COMMENTS_SERVICE_KEY": "forumapikey", "COMMENTS_SERVICE_KEY": "forumapikey",
"COMPREHENSIVE_THEME_DIRS": ["/openedx/themes"], "COMPREHENSIVE_THEME_DIRS": ["/openedx/themes"],

2
tutor/templates/apps/xqueue/settings/tutor.py
View File

@ -17,8 +17,6 @@ LOGGING = get_logger_config(
dev_env=True, dev_env=True,
) )
RABBIT_HOST = '{{ RABBITMQ_HOST }}'
RABBIT_PORT = 5672
SECRET_KEY = '{{ XQUEUE_SECRET_KEY }}' SECRET_KEY = '{{ XQUEUE_SECRET_KEY }}'
XQUEUE_USERS = { XQUEUE_USERS = {

2
tutor/templates/config-defaults.yml
View File

@ -36,6 +36,8 @@ NGINX_HTTPS_PORT: 443
NOTES_MYSQL_DATABASE: "notes" NOTES_MYSQL_DATABASE: "notes"
NOTES_MYSQL_USERNAME: "notes" NOTES_MYSQL_USERNAME: "notes"
RABBITMQ_HOST: "rabbitmq" RABBITMQ_HOST: "rabbitmq"
RABBITMQ_USERNAME: ""
RABBITMQ_PASSWORD: ""
SMTP_HOST: "smtp" SMTP_HOST: "smtp"
SMTP_PORT: 25 SMTP_PORT: 25
SMTP_USERNAME: "" SMTP_USERNAME: ""