Dockerfile

-ARG product_version=7.3.3
-ARG build_number=50
+ARG product_version=7.5.1
+ARG build_number=1
 ARG oo_root='/var/www/onlyoffice/documentserver'
 
 ## Setup

default-override.json

 {
+  "tenants": {
+    "aggregationTenant": "__aggregation"
+  },
   "services": {
     "CoAuthoring": {
       "autoAssembly": {

server.patch

 diff --git a/Common/sources/constants.js b/Common/sources/constants.js
-index b9c2906..4124680 100644
+index 3e8e7aaa..028c0d44 100644
 --- a/Common/sources/constants.js
 +++ b/Common/sources/constants.js
-@@ -84,7 +84,7 @@ exports.LICENSE_RESULT = {
-   UsersViewCountOS: 15
+@@ -85,8 +85,8 @@ exports.LICENSE_RESULT = {
+   NotBefore: 16
  };
  
 -exports.LICENSE_CONNECTIONS = 20;
+-exports.LICENSE_USERS = 3;
 +exports.LICENSE_CONNECTIONS = 9999;
++exports.LICENSE_USERS = 200;
  exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
  
  exports.AVS_OFFICESTUDIO_FILE_UNKNOWN =  0x0000;
 diff --git a/Common/sources/license.js b/Common/sources/license.js
-index 1b617c6..4f5d25f 100644
+index 5df8d693..3268abbe 100644
 --- a/Common/sources/license.js
 +++ b/Common/sources/license.js
 @@ -45,23 +45,23 @@ exports.readLicense = function*() {
@@ -50,46 +52,51 @@ index 1b617c6..4f5d25f 100644
  };
  
 diff --git a/Common/sources/tenantManager.js b/Common/sources/tenantManager.js
-index 66dbb96..3fc932b 100644
+index 9ea972a6..209f1299 100644
 --- a/Common/sources/tenantManager.js
 +++ b/Common/sources/tenantManager.js
-@@ -140,6 +140,10 @@ function getTenantLicense(ctx) {
+@@ -255,6 +255,12 @@ function getTenantLicense(ctx) {
+         res.type = constants.LICENSE_RESULT.Error;
          ctx.logger.error('getTenantLicense error: missing "alias" field');
        }
-     } else {
++    } else {
 +      // This might need to be changed
 +      // xbeeant chose to always return a static object, it might break in multitenant mode ?
 +      // Maybe you can use the generation to retrieve the one defined in license.js [res] = yield* license.readLicense(licensePath);
 +      // Or it might work just like that.
-       res = licenseInfo;
++      res = licenseInfo;
      }
      return res;
+   });
 diff --git a/DocService/sources/server.js b/DocService/sources/server.js
-index 74a00b0..0c7e4e7 100644
+index 76303af9..db83741b 100644
 --- a/DocService/sources/server.js
 +++ b/DocService/sources/server.js
-@@ -111,7 +111,6 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
- 
- if (!tenantManager.isMultitenantMode()) {
- 	updateLicense();
--	fs.watchFile(cfgLicenseFile, updateLicense);
- 	setInterval(updateLicense, 86400000);
+@@ -109,8 +109,6 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
  }
  
+ updateLicense();
+-fs.watchFile(cfgLicenseFile, updateLicense);
+-setInterval(updateLicense, 86400000);
+ 
+ if (config.has('services.CoAuthoring.server.static_content')) {
+ 	const staticContent = config.get('services.CoAuthoring.server.static_content');
 diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
-index 2a0b366..96468f9 100644
+index 46615032..41e54b00 100644
 --- a/FileConverter/sources/convertermaster.js
 +++ b/FileConverter/sources/convertermaster.js
-@@ -93,7 +93,6 @@ if (cluster.isMaster) {
-   updateLicense();
+@@ -91,9 +91,6 @@ if (cluster.isMaster) {
+   });
  
-   if (!tenantManager.isMultitenantMode()) {
--    fs.watchFile(cfgLicenseFile, updateLicense);
-     setInterval(updateLicense, 86400000);
-   }
+   updateLicense();
+-
+-  fs.watchFile(cfgLicenseFile, updateLicense);
+-  setInterval(updateLicense, 86400000);
  } else {
+   const converter = require('./converter');
+   converter.run();
 diff --git a/Makefile b/Makefile
-index e8e1308..23f7e2e 100644
+index e8e1308f..23f7e2ef 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -87,7 +87,7 @@ DEBUG = $(BRANDING_DIR)/debug.js