Merge remote-tracking branch 'origin/maven/fixes/8.1' into maven/rele…

…ase/8.1
edu-sharing · Feb 15, 2024 · 84a5100 · 84a5100
2 parents c0a85dd + f676a35
commit 84a5100
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/deploy/docker/compose/src/main/compose/2_connector-common.yml b/deploy/docker/compose/src/main/compose/2_connector-common.yml
@@ -29,6 +29,7 @@ services:
       ONLYOFFICE_DOCUMENT_SERVER: "${SERVICES_EDU_CONNECTOR_ONLYOFFICE_DOCUMENT_SERVER:-}"
       ONLYOFFICE_PLUGIN_URL: "${SERVICES_EDU_CONNECTOR_ONLYOFFICE_PLUGIN_URL:-}"
       ONLYOFFICE_JWT_SECRET: "${SERVICES_EDU_CONNECTOR_ONLYOFFICE_JWT_SECRET:-}"
+      H5P_SUPPRESS_CLEANUP: "${SERVICES_EDU_CONNECTOR_H5P_SUPPRESS_CLEANUP:-false}"
       UPLOAD_FILE_SIZE: "${SERVICES_EDU_CONNECTOR_UPLOAD_FILE_SIZE:-512M}"
       POST_MAX_SIZE: "${SERVICES_EDU_CONNECTOR_POST_MAX_SIZE:-513M}"
       MEMORY_LIMIT: "${SERVICES_EDU_CONNECTOR_MEMORY_LIMIT:-1024M}"

diff --git a/service/src/main/docker/entrypoint.sh b/service/src/main/docker/entrypoint.sh
@@ -31,6 +31,8 @@ only_office_document_server="${ONLYOFFICE_DOCUMENT_SERVER:-}"
 only_office_plugin_url="${ONLYOFFICE_PLUGIN_URL:-}"
 only_office_jwt_secret="${ONLYOFFICE_JWT_SECRET:-}"
 
+h5p_suppress_cleanup="${H5P_SUPPRESS_CLEANUP:-false}"
+
 # shellcheck disable=SC2153
 moodle_base_dir="${MOODLE_BASE_DIR:-}"
 # shellcheck disable=SC2153
@@ -60,6 +62,8 @@ sed -i "s|define('ONLYOFFICE_JWT_SECRET', '.*')|define('ONLYOFFICE_JWT_SECRET',
 sed -i "s|define('MOODLE_BASE_DIR', '.*')|define('MOODLE_BASE_DIR', '${moodle_base_dir}')|g" "${conf}"
 sed -i "s|define('MOODLE_TOKEN', '.*')|define('MOODLE_TOKEN', '${moodle_token}')|g" "${conf}"
 
+sed -i "s|define('H5P_SUPPRESS_CLEANUP', false)|define('H5P_SUPPRESS_CLEANUP', ${h5p_suppress_cleanup})|g" "${conf}"
+
 echo "Installing..."
 php install/install.php