From 6ad55e1e0031536b1e9d8bd44c4b4d5ba69b4daf Mon Sep 17 00:00:00 2001 From: Akanshu Aich Date: Mon, 22 Sep 2025 13:59:28 +0000 Subject: [PATCH] refactor: contract features dict settings into top level settings --- docker/build/edxapp/lms.yml | 32 ------------------ docker/build/edxapp/studio.yml | 32 ------------------ playbooks/roles/edxapp/defaults/main.yml | 42 ------------------------ 3 files changed, 106 deletions(-) diff --git a/docker/build/edxapp/lms.yml b/docker/build/edxapp/lms.yml index 01a4f1bd2..1149149d3 100644 --- a/docker/build/edxapp/lms.yml +++ b/docker/build/edxapp/lms.yml @@ -265,37 +265,6 @@ EXTRA_MIDDLEWARE_CLASSES: [] FACEBOOK_API_VERSION: v2.1 FACEBOOK_APP_ID: FACEBOOK_APP_ID FACEBOOK_APP_SECRET: FACEBOOK_APP_SECRET -FEATURES: - AUTOMATIC_AUTH_FOR_TESTING: false - CUSTOM_COURSES_EDX: false - ENABLE_COMBINED_LOGIN_REGISTRATION: true - ENABLE_CORS_HEADERS: false - ENABLE_COUNTRY_ACCESS: false - ENABLE_CREDIT_API: false - ENABLE_CREDIT_ELIGIBILITY: false - ENABLE_CROSS_DOMAIN_CSRF_COOKIE: false - ENABLE_CSMH_EXTENDED: true - ENABLE_DISCUSSION_HOME_PANEL: true - ENABLE_DISCUSSION_SERVICE: true - ENABLE_EDXNOTES: true - ENABLE_ENROLLMENT_RESET: false - ENABLE_GRADE_DOWNLOADS: true - ENABLE_MKTG_SITE: false - ENABLE_MOBILE_REST_API: false - ENABLE_OAUTH2_PROVIDER: false - ENABLE_PUBLISHER: false - ENABLE_READING_FROM_MULTIPLE_HISTORY_TABLES: true - ENABLE_SPECIAL_EXAMS: false - ENABLE_SYSADMIN_DASHBOARD: false - ENABLE_THIRD_PARTY_AUTH: true - ENABLE_VIDEO_UPLOAD_PIPELINE: false - PREVIEW_LMS_BASE: preview.localhost:18000 - SHOW_FOOTER_LANGUAGE_SELECTOR: false - SHOW_HEADER_LANGUAGE_SELECTOR: false -############################################## -# Dedenting FEATURES dict -# For more information visit: https://2u-internal.atlassian.net/browse/BOMS-200 -# https://github.com/openedx/edx-platform/issues/37226 AUTOMATIC_AUTH_FOR_TESTING: false CUSTOM_COURSES_EDX: false ENABLE_COMBINED_LOGIN_REGISTRATION: true @@ -322,7 +291,6 @@ ENABLE_VIDEO_UPLOAD_PIPELINE: false PREVIEW_LMS_BASE: preview.localhost:18000 SHOW_FOOTER_LANGUAGE_SELECTOR: false SHOW_HEADER_LANGUAGE_SELECTOR: false -############################################## FEEDBACK_SUBMISSION_EMAIL: '' FERNET_KEYS: - DUMMY KEY CHANGE BEFORE GOING TO PRODUCTION diff --git a/docker/build/edxapp/studio.yml b/docker/build/edxapp/studio.yml index 8e107a7ba..0f86bfeb7 100644 --- a/docker/build/edxapp/studio.yml +++ b/docker/build/edxapp/studio.yml @@ -233,37 +233,6 @@ EXTRA_MIDDLEWARE_CLASSES: [] FACEBOOK_API_VERSION: v2.1 FACEBOOK_APP_ID: FACEBOOK_APP_ID FACEBOOK_APP_SECRET: FACEBOOK_APP_SECRET -FEATURES: - AUTOMATIC_AUTH_FOR_TESTING: false - CUSTOM_COURSES_EDX: false - ENABLE_COMBINED_LOGIN_REGISTRATION: true - ENABLE_CORS_HEADERS: false - ENABLE_COUNTRY_ACCESS: false - ENABLE_CREDIT_API: false - ENABLE_CREDIT_ELIGIBILITY: false - ENABLE_CROSS_DOMAIN_CSRF_COOKIE: false - ENABLE_CSMH_EXTENDED: true - ENABLE_DISCUSSION_HOME_PANEL: true - ENABLE_DISCUSSION_SERVICE: true - ENABLE_EDXNOTES: true - ENABLE_ENROLLMENT_RESET: false - ENABLE_GRADE_DOWNLOADS: true - ENABLE_MKTG_SITE: false - ENABLE_MOBILE_REST_API: false - ENABLE_OAUTH2_PROVIDER: false - ENABLE_PUBLISHER: false - ENABLE_READING_FROM_MULTIPLE_HISTORY_TABLES: true - ENABLE_SPECIAL_EXAMS: false - ENABLE_SYSADMIN_DASHBOARD: false - ENABLE_THIRD_PARTY_AUTH: true - ENABLE_VIDEO_UPLOAD_PIPELINE: false - PREVIEW_LMS_BASE: preview.localhost:18000 - SHOW_FOOTER_LANGUAGE_SELECTOR: false - SHOW_HEADER_LANGUAGE_SELECTOR: false -############################################## -# Dedenting FEATURES dict -# For more information visit: https://2u-internal.atlassian.net/browse/BOMS-200 -# https://github.com/openedx/edx-platform/issues/37226 AUTOMATIC_AUTH_FOR_TESTING: false CUSTOM_COURSES_EDX: false ENABLE_COMBINED_LOGIN_REGISTRATION: true @@ -290,7 +259,6 @@ ENABLE_VIDEO_UPLOAD_PIPELINE: false PREVIEW_LMS_BASE: preview.localhost:18000 SHOW_FOOTER_LANGUAGE_SELECTOR: false SHOW_HEADER_LANGUAGE_SELECTOR: false -############################################## FEEDBACK_SUBMISSION_EMAIL: '' FERNET_KEYS: - DUMMY KEY CHANGE BEFORE GOING TO PRODUCTION diff --git a/playbooks/roles/edxapp/defaults/main.yml b/playbooks/roles/edxapp/defaults/main.yml index 841d3baf9..cd370fd49 100644 --- a/playbooks/roles/edxapp/defaults/main.yml +++ b/playbooks/roles/edxapp/defaults/main.yml @@ -331,42 +331,6 @@ EDXAPP_X_FRAME_OPTIONS: "DENY" # Reset functionality for master's integration environments EDXAPP_ENABLE_ENROLLMENT_RESET: false -EDXAPP_FEATURES_DEFAULT: - AUTH_USE_OPENID_PROVIDER: "{{ EDXAPP_AUTH_USE_OPENID_PROVIDER }}" - ENABLE_DISCUSSION_SERVICE: "{{ EDXAPP_ENABLE_DISCUSSION_SERVICE }}" - PREVIEW_LMS_BASE: "{{ EDXAPP_PREVIEW_LMS_BASE }}" - ENABLE_GRADE_DOWNLOADS: "{{ EDXAPP_ENABLE_GRADE_DOWNLOADS }}" - ENABLE_MKTG_SITE: "{{ EDXAPP_ENABLE_MKTG_SITE }}" - ENABLE_PUBLISHER: "{{ EDXAPP_ENABLE_PUBLISHER }}" - AUTOMATIC_AUTH_FOR_TESTING: "{{ EDXAPP_ENABLE_AUTO_AUTH }}" - ENABLE_THIRD_PARTY_AUTH: "{{ EDXAPP_ENABLE_THIRD_PARTY_AUTH }}" - ENABLE_BULK_ENROLLMENT_VIEW: "{{ EDXAPP_ENABLE_BULK_ENROLLMENT_VIEW }}" - ENABLE_VIDEO_UPLOAD_PIPELINE: "{{ EDXAPP_ENABLE_VIDEO_UPLOAD_PIPELINE }}" - ENABLE_DISCUSSION_HOME_PANEL: "{{ EDXAPP_ENABLE_DISCUSSION_HOME_PANEL }}" - ENABLE_COMBINED_LOGIN_REGISTRATION: "{{ EDXAPP_ENABLE_COMBINED_LOGIN_REGISTRATION }}" - ENABLE_CORS_HEADERS: "{{ EDXAPP_ENABLE_CORS_HEADERS }}" - ENABLE_CROSS_DOMAIN_CSRF_COOKIE: "{{ EDXAPP_ENABLE_CROSS_DOMAIN_CSRF_COOKIE }}" - ENABLE_COUNTRY_ACCESS: "{{ EDXAPP_ENABLE_COUNTRY_ACCESS }}" - ENABLE_EDXNOTES: "{{ EDXAPP_ENABLE_EDXNOTES }}" - ENABLE_CREDIT_API: "{{ EDXAPP_ENABLE_CREDIT_API }}" - ENABLE_CREDIT_ELIGIBILITY: "{{ EDXAPP_ENABLE_CREDIT_ELIGIBILITY }}" - ENABLE_LTI_PROVIDER: "{{ EDXAPP_ENABLE_LTI_PROVIDER }}" - ENABLE_SPECIAL_EXAMS: "{{ EDXAPP_ENABLE_SPECIAL_EXAMS }}" - ENABLE_OAUTH2_PROVIDER: "{{ EDXAPP_ENABLE_OAUTH2_PROVIDER }}" - ENABLE_SYSADMIN_DASHBOARD: "{{ EDXAPP_ENABLE_SYSADMIN_DASHBOARD }}" - ENABLE_MOBILE_REST_API: "{{ EDXAPP_ENABLE_MOBILE_REST_API }}" - CUSTOM_COURSES_EDX: "{{ EDXAPP_CUSTOM_COURSES_EDX }}" - ENABLE_CSMH_EXTENDED: "{{ EDXAPP_ENABLE_CSMH_EXTENDED }}" - ENABLE_READING_FROM_MULTIPLE_HISTORY_TABLES: "{{ EDXAPP_ENABLE_READING_FROM_MULTIPLE_HISTORY_TABLES }}" - SHOW_HEADER_LANGUAGE_SELECTOR: "{{ EDXAPP_SHOW_HEADER_LANGUAGE_SELECTOR }}" - SHOW_FOOTER_LANGUAGE_SELECTOR: "{{ EDXAPP_SHOW_FOOTER_LANGUAGE_SELECTOR }}" - ENABLE_ENROLLMENT_RESET: "{{ EDXAPP_ENABLE_ENROLLMENT_RESET }}" - ENABLE_EXPORT_GIT: "{{ EDXAPP_ENABLE_EXPORT_GIT }}" - -EDXAPP_FEATURES_EXTRA: {} - -EDXAPP_FEATURES: "{{ EDXAPP_FEATURES_DEFAULT | combine(EDXAPP_FEATURES_EXTRA) }}" - # This needs to be set to localhost # if xqueue is run on the same server # as the lms (it's sent in the request) @@ -1416,11 +1380,6 @@ generic_env_config: &edxapp_generic_env EMAIL_USE_TLS: "{{ EDXAPP_EMAIL_USE_TLS }}" AWS_SES_REGION_NAME: "{{ EDXAPP_AWS_SES_REGION_NAME }}" AWS_SES_REGION_ENDPOINT: "{{ EDXAPP_AWS_SES_REGION_ENDPOINT }}" - FEATURES: "{{ EDXAPP_FEATURES }}" - ############################################## - # Duplicating EDXAPP_FEATURES dict at config level - # For more information visit: https://2u-internal.atlassian.net/browse/BOMS-200 - # https://github.com/openedx/edx-platform/issues/37226 AUTH_USE_OPENID_PROVIDER: "{{ EDXAPP_AUTH_USE_OPENID_PROVIDER }}" ENABLE_DISCUSSION_SERVICE: "{{ EDXAPP_ENABLE_DISCUSSION_SERVICE }}" PREVIEW_LMS_BASE: "{{ EDXAPP_PREVIEW_LMS_BASE }}" @@ -1451,7 +1410,6 @@ generic_env_config: &edxapp_generic_env SHOW_FOOTER_LANGUAGE_SELECTOR: "{{ EDXAPP_SHOW_FOOTER_LANGUAGE_SELECTOR }}" ENABLE_ENROLLMENT_RESET: "{{ EDXAPP_ENABLE_ENROLLMENT_RESET }}" ENABLE_EXPORT_GIT: "{{ EDXAPP_ENABLE_EXPORT_GIT }}" - ############################################## WIKI_ENABLED: true SYSLOG_SERVER: "{{ EDXAPP_SYSLOG_SERVER }}" LOG_DIR: "{{ edxapp_log_dir }}"