tutor 23.0.0.dev3180__tar.gz → 23.0.0.dev3187__tar.gz

{tutor-23.0.0.dev3180 → tutor-23.0.0.dev3187}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: tutor
-Version: 23.0.0.dev3180
+Version: 23.0.0.dev3187
 Summary: The Docker-based Open edX distribution designed for peace of mind
 Project-URL: Homepage, https://docs.tutor.edly.io/
 Project-URL: Documentation, https://docs.tutor.edly.io/

{tutor-23.0.0.dev3180 → tutor-23.0.0.dev3187}/tutor/templates/apps/openedx/settings/lms/development.py

@@ -26,10 +26,8 @@ SESSION_COOKIE_SAMESITE = "Lax"
 # CMS authentication
 IDA_LOGOUT_URI_LIST.append("http://{{ CMS_HOST }}:8001/logout/")
 
-FEATURES["ENABLE_COURSEWARE_MICROFRONTEND"] = False
-
 # Disable enterprise integration
-FEATURES["ENABLE_ENTERPRISE_INTEGRATION"] = False
+ENABLE_ENTERPRISE_INTEGRATION = False
 SYSTEM_WIDE_ROLE_CLASSES.remove("enterprise.SystemWideEnterpriseUserRoleAssignment")
 
 LOGGING["loggers"]["oauth2_provider"] = {

{tutor-23.0.0.dev3180 → tutor-23.0.0.dev3187}/tutor/templates/apps/openedx/settings/partials/common_all.py

@@ -4,6 +4,14 @@ import os
 
 from xmodule.modulestore.modulestore_settings import update_module_store_settings
 
+# Re-bind the FEATURES proxy to this settings module, so that both flat feature
+# settings and legacy FEATURES["..."] reads and writes resolve here.
+try:
+    from openedx.core.lib.features_setting_proxy import FeaturesProxy
+    FEATURES = FeaturesProxy(globals())
+except ImportError:
+    pass
+
 # Mongodb connection parameters: simply modify `mongodb_parameters` to affect all connections to MongoDb.
 mongodb_parameters = {
     "db": "{{ MONGODB_DATABASE }}",
@@ -229,9 +237,9 @@ JWT_AUTH["JWT_ISSUERS"] = [
 ]
 
 # Enable/Disable some features globally
-FEATURES["ENABLE_DISCUSSION_SERVICE"] = False
-FEATURES["PREVENT_CONCURRENT_LOGINS"] = False
-FEATURES["ENABLE_CORS_HEADERS"] = True
+ENABLE_DISCUSSION_SERVICE = False
+PREVENT_CONCURRENT_LOGINS = False
+ENABLE_CORS_HEADERS = True
 
 # CORS
 CORS_ALLOW_CREDENTIALS = True

{tutor-23.0.0.dev3180 → tutor-23.0.0.dev3187}/tutor/templates/apps/openedx/settings/partials/common_cms.py

@@ -21,7 +21,7 @@ FRONTEND_LOGIN_URL = LMS_ROOT_URL + '/login'
 FRONTEND_REGISTER_URL = LMS_ROOT_URL + '/register'
 
 # Enable "reindex" button
-FEATURES["ENABLE_COURSEWARE_INDEX"] = True
+ENABLE_COURSEWARE_INDEX = True
 
 # Create folders if necessary
 for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT, ORA2_FILEUPLOAD_ROOT]:

{tutor-23.0.0.dev3180 → tutor-23.0.0.dev3187}/tutor/templates/apps/openedx/settings/partials/common_lms.py

@@ -21,7 +21,7 @@ OAUTH_ENFORCE_SECURE = False
 # Email settings
 DEFAULT_EMAIL_LOGO_URL = LMS_ROOT_URL + "/theming/asset/images/logo.png"
 BULK_EMAIL_SEND_USING_EDX_ACE = True
-FEATURES["ENABLE_FOOTER_MOBILE_APP_LINKS"] = False
+ENABLE_FOOTER_MOBILE_APP_LINKS = False
 
 # Branding
 MOBILE_STORE_ACE_URLS = {}
@@ -38,9 +38,9 @@ CACHES["staticfiles"] = {
 }
 
 # Enable search features
-FEATURES["ENABLE_COURSE_DISCOVERY"] = True
-FEATURES["ENABLE_COURSEWARE_SEARCH"] = True
-FEATURES["ENABLE_DASHBOARD_SEARCH"] = True
+ENABLE_COURSE_DISCOVERY = True
+ENABLE_COURSEWARE_SEARCH = True
+ENABLE_DASHBOARD_SEARCH = True
 
 # Create folders if necessary
 for folder in [DATA_DIR, LOG_DIR, MEDIA_ROOT, STATIC_ROOT, ORA2_FILEUPLOAD_ROOT]:

{tutor-23.0.0.dev3180 → tutor-23.0.0.dev3187}/tutor/templates/jobs/init/mysql.sh

@@ -16,6 +16,12 @@ echo "MySQL is up and running"
 
 # edx-platform database
 mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "CREATE DATABASE IF NOT EXISTS {{ OPENEDX_MYSQL_DATABASE }};"
-mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "CREATE USER IF NOT EXISTS '{{ OPENEDX_MYSQL_USERNAME }}';"
+# This command may fail if the specified user has created a custom view, such
+# as is done in the enterprise app.
+#
+# Yes, even 'if not exists' does not prevent this. :/
+# https://bugs.mysql.com/bug.php?id=107139
+mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "CREATE USER IF NOT EXISTS '{{ OPENEDX_MYSQL_USERNAME }}';" || true
+# If the user truly doesn't exist, we'll get an error here.
 mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "ALTER USER '{{ OPENEDX_MYSQL_USERNAME }}'@'%' IDENTIFIED BY '{{ OPENEDX_MYSQL_PASSWORD }}';"
 mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "GRANT ALL ON {{ OPENEDX_MYSQL_DATABASE }}.* TO '{{ OPENEDX_MYSQL_USERNAME }}'@'%';"