pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

[license] Type

Browse Source 
Move package type to license.
warning_limit_percents string -> int
This commit is contained in:
Alexander.Trofimov
2020-02-11 11:43:24 +03:00
parent 311c7cc4bc
commit 88e37601ff
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Common/config/default.json
View File

@ -216,7 +216,8 @@
},
"license" : {
"license_file": "",
"warning_limit_percents": "70"
"warning_limit_percents": 70,
"packageType": 0
},
"FileConverter": {
"converter": {

3
Common/config/development-mac.json
View File

@ -45,7 +45,8 @@
},
"license": {
"license_file": "./../../license.lic",
"warning_limit_percents": "70"
"warning_limit_percents": 70,
"packageType": 0
},
"FileConverter": {
"converter": {

3
Common/config/development-windows.json
View File

@ -45,7 +45,8 @@
},
"license": {
"license_file": "./../../license.lic",
"warning_limit_percents": "70"
"warning_limit_percents": 70,
"packageType": 0
},
"FileConverter": {
"converter": {

3
Common/config/production-linux.json
View File

@ -47,7 +47,8 @@
},
"license": {
"license_file": "/var/www/onlyoffice/documentserver/../Data/license.lic",
"warning_limit_percents": "70"
"warning_limit_percents": 70,
"packageType": 0
},
"FileConverter": {
"converter": {

3
Common/config/production-windows.json
View File

@ -47,7 +47,8 @@
},
"license": {
"license_file": "./../../license.lic",
"warning_limit_percents": "70"
"warning_limit_percents": 70,
"packageType": 0
},
"FileConverter": {
"converter": {

2
Common/sources/license.js
View File

@ -44,7 +44,7 @@ const redisClient = pubsubRedis.getClientRedis();
const buildDate = '6/29/2016';
const oBuildDate = new Date(buildDate);
const oPackageType = constants.PACKAGE_TYPE_OS;
const oPackageType = configL.get('packageType');
const cfgRedisPrefix = config.get('services.CoAuthoring.redis.prefix');
const redisKeyLicense = cfgRedisPrefix + ((constants.PACKAGE_TYPE_OS === oPackageType) ? constants.REDIS_KEY_LICENSE :