Feature/ZCS 10534

Common/config/default.json

@@ -76,8 +76,12 @@
 	},
 	"services": {
 		"CoAuthoring": {
+			"ssl" :{
+                "key" : "",
+                "cert" : ""
+            },
 			"server": {
-				"port": 8000,
+				"port": 7084,
 				"workerpercpu": 1,
 				"mode": "development",
 				"limits_tempfile_upload": 104857600,
@@ -119,11 +123,11 @@
 				"limits_image_types_upload": "jpg;jpeg;jpe;png;gif;bmp"
 			},
 			"sql": {
-				"type": "postgres",
+				"type": "mysql",
 				"tableChanges": "doc_changes",
 				"tableResult": "task_result",
 				"dbHost": "localhost",
-				"dbPort": 5432,
+				"dbPort": 7306,
 				"dbName": "onlyoffice",
 				"dbUser": "onlyoffice",
 				"dbPass": "onlyoffice",
@@ -215,7 +219,7 @@
 				"autostart": []
 			},
 			"editor":{
-				"spellcheckerUrl": "",
+				"spellcheckerUrl": "/spellchecker",
 				"reconnection":{
 					"attempts": 50,
 					"delay": "2s"
@@ -296,8 +300,12 @@
 		"silent": true
 	},
 	"SpellChecker": {
+		"ssl" :{
+            "key" : "",
+            "cert" : ""
+        },
 		"server": {
-			"port": 8080,
+			"port": 7085,
 			"mode": "development"
 		}
 	}

Common/config/log4js/logconfig.json

@@ -0,0 +1,15 @@
+{
+	"appenders": {
+		"default": {
+			"type": "file",
+			"filename": "../onlyoffice.log",
+			"layout": {
+				"type": "pattern",
+				"pattern": "[%d] [%p] %c - %.10000m"
+			}
+		}
+	},
+	"categories": {
+		"default": { "appenders": [ "default" ], "level": "WARN" }
+	}
+}

Common/config/onlyofficeconfig.json

@@ -0,0 +1,70 @@
+{
+  "log": {
+    "filePath": "../documentserver/server/Common/config/log4js/logconfig.json"
+  },
+  "storage": {
+    "fs": {
+      "folderPath": "../documentserver/App_Data/cache/files"
+    }
+  },
+  "services": {
+    "CoAuthoring": {
+      "server": {
+        "static_content": {
+          "/fonts": {
+            "path": "../documentserver/fonts",
+            "options": {"maxAge": "7d"}
+          },
+          "/sdkjs": {
+            "path": "../documentserver/sdkjs",
+            "options": {"maxAge": "7d"}
+          },
+          "/web-apps": {
+            "path": "../documentserver/web-apps",
+            "options": {"maxAge": "7d"}
+          },
+          "/sdkjs-plugins": {
+            "path": "../documentserver/sdkjs-plugins",
+            "options": {"maxAge": "7d"}
+          },
+          "/App_Data": {
+            "path": "../documentserver/App_Data",
+            "options": {"maxAge": "7d"}
+          }
+        }
+      },
+      "utils": {
+        "utils_common_fontdir": "/usr/share/fonts"
+      },
+      "request-filtering-agent" : {
+        "allowPrivateIPAddress": true,
+        "allowMetaIPAddress": true
+      },
+      "sockjs": {
+        "sockjs_url": "../documentserver/web-apps/vendor/sockjs/sockjs.min.js"
+      }
+    }
+  },
+  "license": {
+    "license_file": "./../documentserver/license.lic",
+    "warning_limit_percents": 70,
+    "packageType": 0
+  },
+  "FileConverter": {
+    "converter": {
+      "fontDir": "/usr/share/fonts",
+      "presentationThemesDir": "../documentserver/sdkjs/slide/themes",
+      "x2tPath": "../documentserver/server/FileConverter/bin/x2t",
+      "docbuilderPath": "../documentserver/server/FileConverter/bin/docbuilder",
+      "docbuilderAllFontsPath": "../documentserver/App_Data/docbuilder/AllFonts.js"
+    }
+  },
+  "FileStorage": {
+    "directory": "../documentserver/App_Data"
+  },
+  "SpellChecker": {
+    "server": {
+      "dictDir": "../documentserver/server/SpellChecker/dictionaries"
+    }
+  }
+}

Common/sources/constants.js

@@ -70,7 +70,7 @@ exports.LICENSE_RESULT = {
   ExpiredLimited: 11
 };
 
-exports.LICENSE_CONNECTIONS = 20;
+exports.LICENSE_CONNECTIONS = 99999;
 exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
 
 exports.AVS_OFFICESTUDIO_FILE_UNKNOWN =  0x0000;

DocService/sources/server.js

@@ -42,6 +42,7 @@ const fs = require('fs');
 
 const express = require('express');
 const http = require('http');
+const https = require('https');
 const urlModule = require('url');
 const path = require('path');
 const bodyParser = require("body-parser");
@@ -55,7 +56,19 @@ const utils = require('./../../Common/sources/utils');
 const commonDefines = require('./../../Common/sources/commondefines');
 const configStorage = configCommon.get('storage');
 const app = express();
-const server = http.createServer(app);
+
+let server = null;
+
+if (config.has('ssl')) {
+	const privateKey = fs.readFileSync(config.get('ssl.key')).toString();
+	const certificateKey = fs.readFileSync(config.get('ssl.cert')).toString();
+	//See detailed options format here: http://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener
+	const options = {key: privateKey, cert: certificateKey};
+
+	server = https.createServer(options, app);
+} else {
+	server = http.createServer(app);
+}
 
 let licenseInfo, updatePluginsTime, userPlugins, pluginsLoaded;
 

SpellChecker/sources/server.js

@@ -93,9 +93,9 @@ if (cluster.isMaster) {
 	if (config.has('ssl')) {
 		const privateKey = fs.readFileSync(config.get('ssl.key')).toString();
 		const certificateKey = fs.readFileSync(config.get('ssl.cert')).toString();
-		const trustedCertificate = fs.readFileSync(config.get('ssl.ca')).toString();
+		//const trustedCertificate = fs.readFileSync(config.get('ssl.ca')).toString();
 		//See detailed options format here: http://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener
-		const options = {key: privateKey, cert: certificateKey, ca: [trustedCertificate]};
+		const options = {key: privateKey, cert: certificateKey};
 
 		server = https.createServer(options, app);
 	} else {

bin/common_util.py

@@ -0,0 +1,63 @@
+import json
+import os.path
+import os
+import sys
+
+def check_services_running():
+	with open(processid_file_path, "r") as f:
+		data = json.load(f)
+
+	if(data["docservice"] > 0 and check_pid(data["docservice"])):
+		sys.exit("Error : docservice running with pid (" + str(data["docservice"]) + ") ")
+	if(data["spellchecker"] > 0 and check_pid(data["spellchecker"])):
+		sys.exit("Error : spellchecker running with pid (" + str(data["spellchecker"]) + ") ")
+	if(data["converter"] > 0 and check_pid(data["converter"])):
+		sys.exit("Error : converter running with pid (" + str(data["converter"]) + ") ")	
+
+def check_docservice_running():
+	with open(processid_file_path, "r") as f:
+		data = json.load(f)
+
+	if(data["docservice"] > 0 and check_pid(data["docservice"])):
+		sys.exit("Error : docservice running with pid (" + str(data["docservice"]) + ") ")
+
+def check_spellchecker_running():
+	with open(processid_file_path, "r") as f:
+		data = json.load(f)
+
+	if(data["spellchecker"] > 0 and check_pid(data["spellchecker"])):
+		sys.exit("Error : spellchecker running with pid (" + str(data["spellchecker"]) + ") ")	
+
+def check_converter_running():
+	with open(processid_file_path, "r") as f:
+		data = json.load(f)
+
+	if(data["converter"] > 0 and check_pid(data["converter"])):
+		sys.exit("Error : converter running with pid (" + str(data["converter"]) + ") ")						
+
+def check_pid(pid):        
+    try:
+        os.kill(pid, 0)
+    except OSError:
+        return False
+    else:
+        return True
+
+def update_processid(docservice_process_id, spellchecker_process_id, converter_process_id):
+	with open(processid_file_path, "r") as f:
+		data = json.load(f)
+
+	if(docservice_process_id > 0):
+		data["docservice"] = docservice_process_id
+	if(spellchecker_process_id > 0):
+		data["spellchecker"] = spellchecker_process_id
+	if(converter_process_id > 0):
+		data["converter"] = converter_process_id	
+
+	with open(processid_file_path, "w") as jsonFile:
+		json.dump(data, jsonFile, indent=4)
+
+	with open(processid_file_path, "r") as f:
+		dataupdated = json.load(f)	
+	#print("Process IDS docservice, spellchecker, converter :: "+str(dataupdated))	
+processid_file_path = "process_id.json"