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

Add support for SMTP SSL, in addition to TLS

Browse Source 
Note that SSL and TLS are incompatible.

Close #231.
This commit is contained in:
Régis Behmo 2019-07-08 06:24:35 +08:00
parent c431fb81ff
commit d7477ba348
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -6,7 +6,7 @@ Note: Breaking changes between versions are indicated by "💥".
- [Bugfix] Fix insecure static asset loading when web proxy is enabled - [Bugfix] Fix insecure static asset loading when web proxy is enabled
- [Improvement] Rename ``SECRET_KEY`` configuration parameter to ``OPENEDX_SECRET_KEY`` - [Improvement] Rename ``SECRET_KEY`` configuration parameter to ``OPENEDX_SECRET_KEY``
- [Improvement] Add support for TLS in external SMTP server (#231) - [Improvement] Add support for SSL and TLS in external SMTP server (#231)
- [Bugfix] Fix missing video transcripts in LMS (#229) - [Bugfix] Fix missing video transcripts in LMS (#229)
- [Improvement] Make it possible to enable/disable multiple plugins at once - [Improvement] Make it possible to enable/disable multiple plugins at once
- [Improvement] Add 'local-docker-compose-nginx-volumes' patch - [Improvement] Add 'local-docker-compose-nginx-volumes' patch

3
docs/configuration.rst
View File

@ -141,8 +141,9 @@ SMTP
- ``SMTP_USERNAME`` (default: ``""``) - ``SMTP_USERNAME`` (default: ``""``)
- ``SMTP_PASSWORD`` (default: ``""``) - ``SMTP_PASSWORD`` (default: ``""``)
- ``SMTP_USE_TLS`` (default: ``false``) - ``SMTP_USE_TLS`` (default: ``false``)
- ``SMTP_USE_SSL`` (default: ``false``)
Note that the SMTP server shipped with Tutor by default does not implement TLS. Note that the SMTP server shipped with Tutor by default does not implement TLS. With external servers, only one of SSL or TLS should be enabled, at most.
SSL/TLS certificates for HTTPS access SSL/TLS certificates for HTTPS access
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2
tutor/templates/apps/openedx/settings/cms/common.py
View File

@ -22,6 +22,8 @@ LOGGING["handlers"]["tracking"] = {
} }
LOGGING["loggers"]["tracking"]["handlers"] = ["console", "local", "tracking"] LOGGING["loggers"]["tracking"]["handlers"] = ["console", "local", "tracking"]
EMAIL_USE_SSL = {{ SMTP_USE_SSL }}
LOCALE_PATHS.append("/openedx/locale") LOCALE_PATHS.append("/openedx/locale")
# Create folders if necessary # Create folders if necessary

2
tutor/templates/apps/openedx/settings/lms/common.py
View File

@ -24,6 +24,8 @@ LOGGING["handlers"]["tracking"] = {
} }
LOGGING["loggers"]["tracking"]["handlers"] = ["console", "local", "tracking"] LOGGING["loggers"]["tracking"]["handlers"] = ["console", "local", "tracking"]
EMAIL_USE_SSL = {{ SMTP_USE_SSL }}
# Fix media files paths # Fix media files paths
VIDEO_IMAGE_SETTINGS["STORAGE_KWARGS"]["location"] = MEDIA_ROOT VIDEO_IMAGE_SETTINGS["STORAGE_KWARGS"]["location"] = MEDIA_ROOT
VIDEO_TRANSCRIPTS_SETTINGS["STORAGE_KWARGS"]["location"] = MEDIA_ROOT VIDEO_TRANSCRIPTS_SETTINGS["STORAGE_KWARGS"]["location"] = MEDIA_ROOT

1
tutor/templates/config.yml
View File

@ -67,4 +67,5 @@ SMTP_PORT: 25
SMTP_USERNAME: "" SMTP_USERNAME: ""
SMTP_PASSWORD: "" SMTP_PASSWORD: ""
SMTP_USE_TLS: false SMTP_USE_TLS: false
SMTP_USE_SSL: false
WEB_PROXY: false WEB_PROXY: false