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

…ase/8.0
edu-sharing · Jul 19, 2023 · 0857e65 · 0857e65
2 parents 51d5468 + a89896f
commit 0857e65
Show file tree

Hide file tree

Showing 3 changed files with 60 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
@@ -26,6 +26,11 @@ services:
       DATABASE_NAME: "${SERVICES_EDU_CONNECTOR_DATABASE_NAME:-connector}"
       DATABASE_USER: "${SERVICES_EDU_CONNECTOR_DATABASE_USER:-connector}"
       DATABASE_PASSWORD: "${SERVICES_EDU_CONNECTOR_DATABASE_PASS:-connector}"
+      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:-}"
+      MOODLE_BASE_DIR: "${SERVICES_EDU_CONNECTOR_MOODLE_BASE_DIR:-}"
+      MOODLE_TOKEN: "${SERVICES_EDU_CONNECTOR_MOODLE_TOKEN:-}"
     volumes:
       - "services-edu-connector-data:/var/data"
     depends_on:

diff --git a/deploy/docker/helm/src/main/chart/templates/statefulset.yml b/deploy/docker/helm/src/main/chart/templates/statefulset.yml
@@ -36,6 +36,14 @@ spec:
           value: {{ required "A valid .Values.passwordDB is required!" .Values.passwordDB }}
         - name: ONLYOFFICE_DOCUMENT_SERVER
           value: {{ .Values.onlyofficeDocumentServer | default "" }}
+        - name: ONLYOFFICE_PLUGIN_URL
+          value: {{ .Values.onlyofficePluginUrl | default "" }}
+        - name: ONLYOFFICE_JWT_SECRET
+          value: {{ .Values.onlyofficeJwtSecret | default "" }}
+        - name: MOODLE_BASE_DIR
+          value: {{ .Values.moodleBaseDir | default "" }}
+        - name: MOODLE_TOKEN
+          value: {{ .Values.moodleToken | default "" }}
         livenessProbe:
           httpGet:
             path: /metadata

diff --git a/service/src/main/php/src/tools/onlyoffice/config.php b/service/src/main/php/src/tools/onlyoffice/config.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ *  OnlyOffice internal configuration and definitions.
+ *  No Changes required here.
+ *
+ */
+
+
+require_once __DIR__ . '/../../../config.php';
+
+define('WEB_ROOT_URL', WWWURL . '/src/tools/onlyoffice');
+
+$GLOBALS['FILE_SIZE_MAX'] = 5242880;
+$GLOBALS['STORAGE_PATH'] = ONLYOFFICE_STORAGEFOLDER;
+
+$GLOBALS['MODE'] = "";
+
+$GLOBALS['DOC_SERV_VIEWD'] = array(".ppt", ".pps", ".odp", ".pdf", ".djvu", ".epub", ".xps");
+$GLOBALS['DOC_SERV_EDITED'] = array(".docx", ".doc", ".odt", ".xlsx", ".xls", ".ods", ".csv", ".pptx", ".ppsx", ".rtf", ".txt", ".mht", ".html", ".htm");
+$GLOBALS['DOC_SERV_CONVERT'] = array(".doc", ".odt", ".xls", ".ods", ".ppt", ".pps", ".odp", ".rtf", ".mht", ".html", ".htm", ".epub");
+
+$GLOBALS['DOC_SERV_TIMEOUT'] = "120000";
+
+
+$GLOBALS['DOC_SERV_STORAGE_URL'] = ONLYOFFICE_DOCUMENT_SERVER . "/FileUploader.ashx";
+$GLOBALS['DOC_SERV_CONVERTER_URL'] = ONLYOFFICE_DOCUMENT_SERVER . "/ConvertService.ashx";
+$GLOBALS['DOC_SERV_API_URL'] = ONLYOFFICE_DOCUMENT_SERVER . "/web-apps/apps/api/documents/api.js";
+$GLOBALS['DOC_SERV_PRELOADER_URL'] = ONLYOFFICE_DOCUMENT_SERVER . "/web-apps/apps/api/documents/cache-scripts.html";
+
+
+$GLOBALS['ExtsSpreadsheet'] = array(".xls", ".xlsx",
+    ".ods", ".csv");
+
+$GLOBALS['ExtsPresentation'] = array(".pps", ".ppsx",
+    ".ppt", ".pptx",
+    ".odp");
+
+$GLOBALS['ExtsDocument'] = array(".docx", ".doc", ".odt", ".rtf", ".txt",
+    ".html", ".htm", ".mht", ".pdf", ".djvu",
+    ".fb2", ".epub", ".xps");
+
+if (!defined('ServiceConverterMaxTry'))
+    define('ServiceConverterMaxTry', 3);
+
+
+?>