From af65688e27b6b3f3fbbcb6be690521cecb768206 Mon Sep 17 00:00:00 2001 From: Chris Patti Date: Fri, 17 Jan 2025 16:35:44 -0500 Subject: [PATCH 1/8] Add the two new Forum v2 activation toggles and remove the disable. --- .../templates/edxapp/mitxonline/common_values.yml.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl index 32cc3e6bf..dc0ccb47b 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl @@ -248,7 +248,7 @@ DEFAULT_FROM_EMAIL: {{ key "edxapp/sender-email-address" }} # MODIFIED DEFAULT_MOBILE_AVAILABLE: false DEFAULT_SITE_THEME: mitxonline # MODIFIED DEPRECATED_ADVANCED_COMPONENT_TYPES: [] -DISABLE_FORUM_V2: true +DISCUSSIONS_ENABLE_FORUM_V2: true DISCUSSIONS_MICROFRONTEND_URL: https://{{ key "edxapp/lms-domain" }}/discuss EDXMKTG_USER_INFO_COOKIE_NAME: {{ env "ENVIRONMENT" }}-edx-user-info @@ -335,6 +335,7 @@ FINANCIAL_REPORTS: ROOT_PATH: sandbox STORAGE_TYPE: localfs FOOTER_ORGANIZATION_IMAGE: /images/logo.png +FORUM_V2_ENABLE_MYSQL_BACKEND: true GITHUB_REPO_ROOT: /openedx/data GOOGLE_ANALYTICS_ACCOUNT: {{ key "edxapp/google-analytics-id" }} GRADES_DOWNLOAD: From ca1a9d4e609383a99053983573b1d83b5536fff6 Mon Sep 17 00:00:00 2001 From: Chris Patti Date: Wed, 22 Jan 2025 18:11:13 -0500 Subject: [PATCH 2/8] fix: Add elasticsearch and mongodb forum settings. --- .../edxapp/mitxonline/common_values.yml.tmpl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl index dc0ccb47b..16fae0f16 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl @@ -336,6 +336,23 @@ FINANCIAL_REPORTS: STORAGE_TYPE: localfs FOOTER_ORGANIZATION_IMAGE: /images/logo.png FORUM_V2_ENABLE_MYSQL_BACKEND: true +FORUM_SEARCH_BACKEND = "forum.search.es.ElasticsearchBackend" +FORUM_ELASTIC_SEARCH_CONFIG = [ + { + "host": "{{ keyOrDefault "elasticsearch/host" "elasticsearch.service.consul" }}" + "port": "443", + "use_ssl": True, + } +] +FORUM_ELASTIC_SEARCH_CONFIG_ES7 = [ + { + "host": "{{ keyOrDefault "elasticsearch/host" "elasticsearch.service.consul" }}", + "port": "443", + "use_ssl": True, + } +] +FORUM_MONGODB_CLIENT_PARAMETERS = mongo_params +FORUM_MONGODB_DATABASE = "edxapp" GITHUB_REPO_ROOT: /openedx/data GOOGLE_ANALYTICS_ACCOUNT: {{ key "edxapp/google-analytics-id" }} GRADES_DOWNLOAD: From b49803d3a069a43d58dc661f863d473047e0428e Mon Sep 17 00:00:00 2001 From: Chris Patti Date: Thu, 23 Jan 2025 10:15:07 -0500 Subject: [PATCH 3/8] fix: I slopped Python data structures into a YHAML template. Whups :) --- .../edxapp/mitxonline/common_values.yml.tmpl | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl index 16fae0f16..0e6d33c03 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl @@ -336,23 +336,21 @@ FINANCIAL_REPORTS: STORAGE_TYPE: localfs FOOTER_ORGANIZATION_IMAGE: /images/logo.png FORUM_V2_ENABLE_MYSQL_BACKEND: true -FORUM_SEARCH_BACKEND = "forum.search.es.ElasticsearchBackend" -FORUM_ELASTIC_SEARCH_CONFIG = [ - { - "host": "{{ keyOrDefault "elasticsearch/host" "elasticsearch.service.consul" }}" - "port": "443", - "use_ssl": True, - } -] -FORUM_ELASTIC_SEARCH_CONFIG_ES7 = [ - { - "host": "{{ keyOrDefault "elasticsearch/host" "elasticsearch.service.consul" }}", - "port": "443", - "use_ssl": True, - } -] -FORUM_MONGODB_CLIENT_PARAMETERS = mongo_params -FORUM_MONGODB_DATABASE = "edxapp" +FORUM_SEARCH_BACKEND: "forum.search.es.ElasticsearchBackend" + +FORUM_ELASTIC_SEARCH_CONFIG: + - host: "{{ keyOrDefault \"elasticsearch/host\" \"elasticsearch.service.consul\" }}" + port: "443" + use_ssl: true + +FORUM_ELASTIC_SEARCH_CONFIG_ES7: + - host: "{{ keyOrDefault \"elasticsearch/host\" \"elasticsearch.service.consul\" }}" + port: "443" + use_ssl: true + +FORUM_MONGODB_CLIENT_PARAMETERS: mongo_params + +FORUM_MONGODB_DATABASE: "edxapp" GITHUB_REPO_ROOT: /openedx/data GOOGLE_ANALYTICS_ACCOUNT: {{ key "edxapp/google-analytics-id" }} GRADES_DOWNLOAD: From 6ede570221348682151911dc69eae160c9536e16 Mon Sep 17 00:00:00 2001 From: Chris Patti Date: Thu, 23 Jan 2025 11:59:46 -0500 Subject: [PATCH 4/8] Remove unused ES7 block Co-authored-by: Tobias Macey --- .../templates/edxapp/mitxonline/common_values.yml.tmpl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl index 0e6d33c03..a84c38932 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl @@ -343,10 +343,6 @@ FORUM_ELASTIC_SEARCH_CONFIG: port: "443" use_ssl: true -FORUM_ELASTIC_SEARCH_CONFIG_ES7: - - host: "{{ keyOrDefault \"elasticsearch/host\" \"elasticsearch.service.consul\" }}" - port: "443" - use_ssl: true FORUM_MONGODB_CLIENT_PARAMETERS: mongo_params From c127edc5ce30ea965777a91ae44a46c19b8ba16b Mon Sep 17 00:00:00 2001 From: Chris Patti Date: Thu, 23 Jan 2025 12:00:25 -0500 Subject: [PATCH 5/8] Correct database name Co-authored-by: Tobias Macey --- .../templates/edxapp/mitxonline/common_values.yml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl index a84c38932..8499931f2 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl @@ -346,7 +346,7 @@ FORUM_ELASTIC_SEARCH_CONFIG: FORUM_MONGODB_CLIENT_PARAMETERS: mongo_params -FORUM_MONGODB_DATABASE: "edxapp" +FORUM_MONGODB_DATABASE: "forum" GITHUB_REPO_ROOT: /openedx/data GOOGLE_ANALYTICS_ACCOUNT: {{ key "edxapp/google-analytics-id" }} GRADES_DOWNLOAD: From cfbbd3d37b7ce019368f985f019ab5d94bee821b Mon Sep 17 00:00:00 2001 From: Chris Patti Date: Thu, 23 Jan 2025 12:00:56 -0500 Subject: [PATCH 6/8] Update src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl Co-authored-by: Tobias Macey --- .../edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl index 8499931f2..3bee71d37 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl @@ -335,7 +335,6 @@ FINANCIAL_REPORTS: ROOT_PATH: sandbox STORAGE_TYPE: localfs FOOTER_ORGANIZATION_IMAGE: /images/logo.png -FORUM_V2_ENABLE_MYSQL_BACKEND: true FORUM_SEARCH_BACKEND: "forum.search.es.ElasticsearchBackend" FORUM_ELASTIC_SEARCH_CONFIG: From 4eb72c1e53227d931de9def306e7faefdfde2591 Mon Sep 17 00:00:00 2001 From: Chris Patti Date: Thu, 23 Jan 2025 12:05:19 -0500 Subject: [PATCH 7/8] Remove unused bogus DISCUSSIONS_ENABLE_FORUM_V2 setting. --- .../edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl index 3bee71d37..0df4235d1 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl @@ -248,7 +248,6 @@ DEFAULT_FROM_EMAIL: {{ key "edxapp/sender-email-address" }} # MODIFIED DEFAULT_MOBILE_AVAILABLE: false DEFAULT_SITE_THEME: mitxonline # MODIFIED DEPRECATED_ADVANCED_COMPONENT_TYPES: [] -DISCUSSIONS_ENABLE_FORUM_V2: true DISCUSSIONS_MICROFRONTEND_URL: https://{{ key "edxapp/lms-domain" }}/discuss EDXMKTG_USER_INFO_COOKIE_NAME: {{ env "ENVIRONMENT" }}-edx-user-info From 208623b0322c8ce816d4c54db0cade84f9ff0564 Mon Sep 17 00:00:00 2001 From: Chris Patti Date: Thu, 23 Jan 2025 12:19:47 -0500 Subject: [PATCH 8/8] Update src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl Fix mongodb client settings Co-authored-by: Tobias Macey --- .../edxapp/mitxonline/common_values.yml.tmpl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl index 0df4235d1..2df01dcbf 100644 --- a/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl +++ b/src/bilder/images/edxapp_v2/templates/edxapp/mitxonline/common_values.yml.tmpl @@ -342,7 +342,17 @@ FORUM_ELASTIC_SEARCH_CONFIG: use_ssl: true -FORUM_MONGODB_CLIENT_PARAMETERS: mongo_params +{{ with secret "secret-mitxonline/mongodb-forum" }} +FORUM_MONGODB_CLIENT_PARAMETERS: + authSource: admin + host: {{ keyOrDefault "mongodb/host" "mongodb-master.service.consul" }} + port: 27017 + db: forum + replicaSet: {{ keyOrDefault "mongodb/replica-set" "rs0" }} + user: {{ .Data.username }} + password: {{ .Data.password }} + ssl: {{ keyOrDefault "mongodb/use-ssl" "false" }} +{{ end }} FORUM_MONGODB_DATABASE: "forum" GITHUB_REPO_ROOT: /openedx/data