Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable Authentication for Elasticsearch #1061

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Enable Authentication for Elasticsearch #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7378e4
Add user authentication to configs
nihxdr May 8, 2024
8ae484f
Update defaults.yml with empty Elasticsearch credentials
nihxdr May 9, 2024
0e536d0
Update Elasticsearch configuration docs
nihxdr May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ Elasticsearch
- ``ELASTICSEARCH_HOST`` (default: ``"elasticsearch"``)
- ``ELASTICSEARCH_PORT`` (default: ``9200``)
- ``ELASTICSEARCH_HEAP_SIZE`` (default: ``"1g"``)
- ``ELASTICSEARCH_USER`` (default: ``""``)
- ``ELASTICSEARCH_PASSWORD`` (default: ``""``)

MongoDB
*******
Expand Down
3 changes: 3 additions & 0 deletions tutor/templates/apps/openedx/settings/partials/common_all.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
{% if ELASTICSEARCH_SCHEME == "https" %}"use_ssl": True,{% endif %}
"host": "{{ ELASTICSEARCH_HOST }}",
"port": {{ ELASTICSEARCH_PORT }},
{% if ELASTICSEARCH_USER != '' and ELASTICSEARCH_PASSWORD != '' %}
"http_auth": ("{{ ELASTICSEARCH_USER}}", "{{ ELASTICSEARCH_PASSWORD }}"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we start supporting http auth in Elasticsearch, then we will have also to update all tutor plugins that connect to Elasticsearch (including forum). This is going to be non-trivial.

{% endif %}
}]

# Common cache config
Expand Down
2 changes: 2 additions & 0 deletions tutor/templates/config/defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ ELASTICSEARCH_HOST: "elasticsearch"
ELASTICSEARCH_PORT: 9200
ELASTICSEARCH_SCHEME: "http"
ELASTICSEARCH_HEAP_SIZE: 1g
ELASTICSEARCH_USER: ""
ELASTICSEARCH_PASSWORD: ""
ENABLE_HTTPS: false
ENABLE_WEB_PROXY: true
JWT_COMMON_AUDIENCE: "openedx"
Expand Down