Created
January 31, 2022 10:38
-
-
Save JMoVS/913974993c58855361bf74af896e3aa1 to your computer and use it in GitHub Desktop.
onlyoffice 7 docker patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 367b3b4507c346ef386682c3f557b3c2b92732c5 Mon Sep 17 00:00:00 2001 | |
From: Justin Scholz <[email protected]> | |
Date: Sat, 29 Jan 2022 20:03:33 +0100 | |
Subject: [PATCH] 20 connections patch | |
--- | |
Common/sources/constants.js | 2 +- | |
Common/sources/license.js | 8 ++++---- | |
DocService/sources/server.js | 2 +- | |
FileConverter/sources/convertermaster.js | 2 +- | |
Makefile | 2 +- | |
5 files changed, 8 insertions(+), 8 deletions(-) | |
diff --git a/Common/sources/constants.js b/Common/sources/constants.js | |
index a6b553b..36f38fe 100644 | |
--- a/Common/sources/constants.js | |
+++ b/Common/sources/constants.js | |
@@ -74,7 +74,7 @@ exports.LICENSE_RESULT = { | |
ExpiredLimited: 11 | |
}; | |
-exports.LICENSE_CONNECTIONS = 20; | |
+exports.LICENSE_CONNECTIONS = 999999; | |
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 3f84ab7..7d968fa 100644 | |
--- a/Common/sources/license.js | |
+++ b/Common/sources/license.js | |
@@ -47,13 +47,13 @@ exports.readLicense = function*() { | |
light: false, | |
packageType: constants.PACKAGE_TYPE_OS, | |
mode: constants.LICENSE_MODE.None, | |
- branding: false, | |
+ branding: true, | |
connections: constants.LICENSE_CONNECTIONS, | |
- customization: false, | |
+ customization: true, | |
usersCount: 0, | |
usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY, | |
- hasLicense: false, | |
- plugins: false, | |
+ hasLicense: true, | |
+ plugins: true, | |
buildDate: oBuildDate, | |
startDate: startDate, | |
endDate: null | |
diff --git a/DocService/sources/server.js b/DocService/sources/server.js | |
index b03e0d0..5aa78cf 100644 | |
--- a/DocService/sources/server.js | |
+++ b/DocService/sources/server.js | |
@@ -137,7 +137,7 @@ try { | |
} catch (e) { | |
logger.warn('Failed to subscribe to plugin folder updates. When changing the list of plugins, you must restart the server. https://nodejs.org/docs/latest/api/fs.html#fs_availability'); | |
} | |
-fs.watchFile(configCommon.get('license').get('license_file'), updateLicense); | |
+//fs.watchFile(configCommon.get('license').get('license_file'), updateLicense); | |
setInterval(updateLicense, 86400000); | |
// Если захочется использовать 'development' и 'production', | |
diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js | |
index 2c4526f..db4180d 100644 | |
--- a/FileConverter/sources/convertermaster.js | |
+++ b/FileConverter/sources/convertermaster.js | |
@@ -85,7 +85,7 @@ if (cluster.isMaster) { | |
updateLicense(); | |
- fs.watchFile(configCommon.get('license').get('license_file'), updateLicense); | |
+// fs.watchFile(configCommon.get('license').get('license_file'), updateLicense); | |
setInterval(updateLicense, 86400000); | |
} else { | |
const converter = require('./converter'); | |
diff --git a/Makefile b/Makefile | |
index e8e1308..3d95aef 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -87,7 +87,7 @@ DEBUG = $(BRANDING_DIR)/debug.js | |
.PHONY: all clean install uninstall build-date | |
.NOTPARALLEL: | |
-all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date | |
+all: $(SPELLCHECKER_DICTIONARIES) $(SCHEMA) $(LICENSE) $(WELCOME) $(INFO) build-date | |
build-date: $(GRUNT_FILES) | |
sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS) | |
-- | |
2.32.0 (Apple Git-132) | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment