Merge remote-tracking branch 'origin/release'

overhangio · Feb 3, 2025 · eb9e171 · eb9e171
2 parents 8e7b27d + 175998a
commit eb9e171
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...gelog.d/20250127_183638_danyal.faheem_support_other_databases_through_plugin.md b/...gelog.d/20250127_183638_danyal.faheem_support_other_databases_through_plugin.md
@@ -0,0 +1 @@
+- [Improvement] Move the openedx-auth patch to the bottom of the auth.yml file to allow patching DATABASES, EMAIL and XQUEUE options. (by @Danyal-Faheem)
diff --git a/tutor/templates/apps/openedx/config/partials/auth.yml b/tutor/templates/apps/openedx/config/partials/auth.yml
@@ -2,7 +2,6 @@ SECRET_KEY: "{{ OPENEDX_SECRET_KEY }}"
 AWS_ACCESS_KEY_ID: "{{ OPENEDX_AWS_ACCESS_KEY }}"
 AWS_SECRET_ACCESS_KEY: "{{ OPENEDX_AWS_SECRET_ACCESS_KEY }}"
 DOC_STORE_CONFIG: null
-{{ patch("openedx-auth") }}
 XQUEUE_INTERFACE:
   django_auth: null
   url: null
@@ -22,3 +21,4 @@ DATABASES:
       {%- endif %}
 EMAIL_HOST_USER: "{{ SMTP_USERNAME }}"
 EMAIL_HOST_PASSWORD: "{{ SMTP_PASSWORD }}"
+{{ patch("openedx-auth") }}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Improvement] Move the openedx-auth patch to the bottom of the auth.yml file to allow patching DATABASES, EMAIL and XQUEUE options. (by @Danyal-Faheem)