@@ -748,23 +760,47 @@
string
+ Defines a path to the favicon for the pdf editor.
+ string
+
Defines a list of WOPI file information parameters that are blocked when sending this array to the browser. However, these parameters are available on the server.
array of strings
+
+ Defines the file types that can be viewed in the pdf editor.
+ array of strings
+
+
+ Defines the file types that can be edited in the pdf editor.
+ array of strings
+
+
+ Defines the form file types.
+ array of strings
+
Defines the file types that can be viewed in the document editor.
array of strings
-
Defines the file types that can be edited in the document editor.
array of strings
-
Defines the editor data storage.
+ Defines the editor data storage. The possible values: "editorDataMemory", "editorDataRedis", "".
string
-
+
+ Defines the editor data storage for license calculation and statistics (local memory or redis). The possible values are "editorDataMemory", "editorDataRedis", or "". The default "" value means that the value of the editorDataStorage parameter will be used. This parameter is primarily used for a sharded cluster.
+ string
+
boolean
-
- Defines if the signed requests for local links are allowed or not. It is used in the multi-tenant mode for server security.
- boolean
-
Defines the parameters that can be passed directly to the node-postgres pool library.
object
-
+ Defines a number of milliseconds a client must remain idle in the pool and not be checked out before it is disconnected from the backend and discarded. Set to 0 to disable automatic disconnection of idle clients.
+ integer
+
+
+ Defines a number of seconds that represents the maximum lifetime.
+ integer
+
+
+ Defines a number of milliseconds before the query statement times out.
+ integer
+
+
+ Defines a number of milliseconds before a query call times out.
+ integer
+
+
+ Defines a number of milliseconds to wait for a connection.
+ integer
+
+
+ Defines the Dameng database parameters.
+ object
+
+
+ Defines if the column names are uppercase or not.
+ boolean
+
+
+ Defines the case of column names.
+ string
+
+
+ Defines a number of milliseconds to wait for a connection.
+ integer
+
+
+ Defines if the login encryption is enabled or not.
+ boolean
+
+
+ Defines the local timezone.
+ integer
+
+
+ Defines a number of seconds after which the pool terminates idle connections (unused in the pool).
+ integer
+
+
+ Defines a number of milliseconds when a connection request made by a client or a server doesn't receive a response from the other end.
+ integer
+
+
+ Defines a number of milliseconds when messages are retained in the queue before they are discarded.
+ integer
+
+
+ Defines the Oracle database parameters.
+ object
+
+
+ Defines a number of seconds to wait for a connection.
+ integer
+
+
+ Defines the MS SQL database parameters.
+ object
+
+
+ Defines the MS SQL database options.
+ object
+
+
+ Defines whether the data will be encrypted before sending it over the network.
+ boolean
+
+
+ Defines whether an encryption occurs when there is no verified server certificate.
+ boolean
+
+
+ Defines the parameters of the connection pool.
+ object
+
+
+ Defines a number of milliseconds a client must remain idle in the pool and not be checked out before it is disconnected from the backend and discarded. Set to 0 to disable automatic disconnection of idle clients.
+ integer
+
@@ -1528,7 +1808,35 @@
"charset": "utf8",
"connectionlimit": 10,
"max_allowed_packet": 1048575,
- "pgPoolExtraOptions": {}
+ "pgPoolExtraOptions": {
+ "idleTimeoutMillis": 30000,
+ "maxLifetimeSeconds": 60000,
+ "statement_timeout": 60000,
+ "query_timeout": 60000,
+ "connectionTimeoutMillis": 60000
+ },
+ "damengExtraOptions": {
+ "columnNameUpperCase": false,
+ "columnNameCase": "lower",
+ "connectTimeout": 60000,
+ "loginEncrypt": false,
+ "localTimezone": 0,
+ "poolTimeout": 60,
+ "socketTimeout": 60000,
+ "queueTimeout": 60000
+ },
+ "oracleExtraOptions": {
+ "connectTimeout": 60
+ },
+ "msSqlExtraOptions": {
+ "options": {
+ "encrypt": false,
+ "trustServerCertificate": true
+ },
+ "pool": {
+ "idleTimeoutMillis": 30000
+ }
+ }
}
}
}
@@ -1594,7 +1902,13 @@
Defines the parameters (username, password, modules etc.) that can be passed directly to the ioredis RedisOptions library.
object
-
+ Defines if the connection to the server will be delayed until the first command is sent or redis.connect() is called explicitly.
+ boolean
+
Defines the parameters (clusterRetryStrategy, dnsLookup, scaleReads etc.) that can be passed directly to the ioredis cluster library
to connect to the redis cluster. This setting has the priority over the iooptions parameter for connecting to the single redis.
object
-
+
+ Defines if the connection to the server will be delayed until the first command is sent or redis.connect() is called explicitly.
+ boolean
+
@@ -1623,9 +1943,13 @@
"port": 6379,
"options": {},
"optionsCluster": {},
- "iooptions": {},
+ "iooptions": {
+ "lazyConnect": true
+ },
"iooptionsClusterNodes": [],
- "iooptionsClusterOptions"": {}
+ "iooptionsClusterOptions": {
+ "lazyConnect": true
+ }
}
}
}
@@ -1750,7 +2074,7 @@
Defines the time for starting check, during which old files are deleted from the cache (every two hours by default).
+ Defines the time for starting check, during which old files are deleted from the cache (every two minutes by default).
string
@@ -1762,7 +2086,7 @@
Defines the time for check starting (every day at midnight by default).
+ Defines the time for check starting (every hour by default).
string
diff --git a/Web/Controls/Help/Server/Document/ChangeThemes/ChangeThemes.ascx b/Web/Controls/Help/Server/Document/ChangeThemes/ChangeThemes.ascx
index fc252297e..c8b40ebf5 100644
--- a/Web/Controls/Help/Server/Document/ChangeThemes/ChangeThemes.ascx
+++ b/Web/Controls/Help/Server/Document/ChangeThemes/ChangeThemes.ascx
@@ -107,7 +107,15 @@
+
+
+
+
+
+
@@ -250,6 +266,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -467,6 +508,14 @@
"/web-apps/apps/presentationeditor/main/resources/img/favicon.ico"wopi.favIconUrlPdf"/web-apps/apps/pdfeditor/main/resources/img/favicon.ico"wopi.fileInfoBlockList["FileUrl"]wopi.pdfView["djvu", "xps", "oxps"]wopi.pdfEdit["pdf"]wopi.forms["pdf"]wopi.wordView["pdf", "djvu", "xps", "oxps", "doc", "dotx", "dotm", "dot", "fodt", "ott", "rtf", "mht", "mhtml", "html", "htm", "xml", "epub", "fb2", "sxw", "stw", "wps", "wpt"]["pdf", "djvu", "xps", "oxps", "doc", "dotx", "dotm", "dot", "fodt", "ott", "rtf", "mht", "mhtml", "html", "htm", "xml", "epub", "fb2", "sxw", "stw", "wps", "wpt", "docxf", "oform"]wopi.wordEdit["docx", "docm", "docxf", "oform", "odt", "txt"]["docx", "docm", "odt", "txt"]wopi.cellViewExternal request
+
+
+
+
+
+
+ | Parameter | +Description | +Type | +Default | +
|---|---|---|---|
externalRequest.directIfIn |
+ Defines the IP addresses that are allowed for direct requests. | +object | ++ |
externalRequest.directIfIn.allowList |
+ Defines a list of the IP addresses that are trusted for the direct requests. | +list | +[] |
+
externalRequest.directIfIn.jwtToken |
+ Defines if the trusted IP addresses are in the JWT or not. | +boolean | +true |
+
externalRequest.action |
+ Defines the external request options. | +object | ++ |
externalRequest.action.allow |
+ Defines if the external requests are allowed or not. | +boolean | +true |
+
externalRequest.action.blockPrivateIP |
+ Defines if the private IP address will be blocked or not. | +boolean | +true |
+
externalRequest.action.proxyUrl |
+ Defines the proxy URL. | +string | +"" |
+
externalRequest.action.proxyUser |
+ Defines the proxy authentication parameters. | +object | ++ |
externalRequest.action.proxyUser.username |
+ Defines the proxy authentication username. | +string | +"" |
+
externalRequest.action.proxyUser.password |
+ Defines the proxy authentication password. | +string | +"" |
+
externalRequest.action.proxyHeaders |
+ Defines the proxy headers. | +object | +{} |
+
These parameters define the configuration of the external requests.
+Example
+"externalRequest": {
+ "directIfIn" : {
+ "allowList": [],
+ "jwtToken": true
+ },
+ "action": {
+ "allow": true,
+ "blockPrivateIP": true,
+ "proxyUrl": "",
+ "proxyUser": {
+ "username": "",
+ "password": ""
+ },
+ "proxyHeaders": {
+ }
+ }
+}
+Document Server services
@@ -1174,9 +1322,15 @@
services.CoAuthoring.server.editorDataStorage"editorDataRedis""editorDataMemory"services.CoAuthoring.server.editorStatStorage""services.CoAuthoring.server.assemblyFormatAsOrigintrueservices.CoAuthoring.server.allowPrivateIPAddressForSignedRequeststrueThese parameters define the server configuration.
@@ -1236,12 +1384,12 @@ "maxRequestChanges": 20000, "openProtectedFile": true, "isAnonymousSupport": true, - "editorDataStorage": "editorDataRedis", + "editorDataStorage": "editorDataMemory", + "editorStatStorage": "", "assemblyFormatAsOrigin": true, "newFileTemplate" : "../../document-templates/new", "downloadFileAllowExt": ["pdf", "xlsx"], - "tokenRequiredParams" : true, - "allowPrivateIPAddressForSignedRequests" : true + "tokenRequiredParams" : true } } } @@ -1508,7 +1656,139 @@services.CoAuthoring.sql.pgPoolExtraOptions{}services.CoAuthoring.sql.pgPoolExtraOptions.idleTimeoutMillis30000services.CoAuthoring.sql.pgPoolExtraOptions.maxLifetimeSeconds60000services.CoAuthoring.sql.pgPoolExtraOptions.statement_timeout60000services.CoAuthoring.sql.pgPoolExtraOptions.query_timeout60000services.CoAuthoring.sql.pgPoolExtraOptions.connectionTimeoutMillis60000services.CoAuthoring.sql.damengExtraOptionsservices.CoAuthoring.sql.damengExtraOptions.columnNameUpperCasefalseservices.CoAuthoring.sql.damengExtraOptions.columnNameCase"lower"services.CoAuthoring.sql.damengExtraOptions.connectTimeout60000services.CoAuthoring.sql.damengExtraOptions.loginEncryptfalseservices.CoAuthoring.sql.damengExtraOptions.localTimezone0services.CoAuthoring.sql.damengExtraOptions.poolTimeout60services.CoAuthoring.sql.damengExtraOptions.socketTimeout60000services.CoAuthoring.sql.damengExtraOptions.queueTimeout60000services.CoAuthoring.sql.oracleExtraOptionsservices.CoAuthoring.sql.oracleExtraOptions.connectTimeout60services.CoAuthoring.sql.msSqlExtraOptionsservices.CoAuthoring.sql.msSqlExtraOptions.optionsservices.CoAuthoring.sql.msSqlExtraOptions.options.encryptfalseservices.CoAuthoring.sql.msSqlExtraOptions.options.trustServerCertificatetrueservices.CoAuthoring.sql.msSqlExtraOptions.poolservices.CoAuthoring.sql.msSqlExtraOptions.pool.idleTimeoutMillis30000services.CoAuthoring.redis.iooptions{}services.CoAuthoring.redis.iooptions.lazyConnecttrueservices.CoAuthoring.redis.iooptionsClusterNodes{}services.CoAuthoring.redis.iooptionsClusterOptions.lazyConnecttrueservices.CoAuthoring.expire.documentsCron"0 */2 * * * *"services.CoAuthoring.expire.filesCron"00 00 */1 * * *"The toolbar header color for presentations.
" />
#aa5252#BE664Ftoolbar-header-pdfThe toolbar header color for pdfs.
+" />
#AA5252text-toolbar-header-on-background-documentThe text color of the user initials from the presentations toolbar header.
" />
#854535text-toolbar-header-on-background-pdfThe text color of the user initials from the pdfs toolbar header.
+" />
#8D4444#fffbackground-fill-buttonThe background color of the button from the form header.
+" />
#FFD112shadow-contrast-popoverThe background color of the information tip shadow.
@@ -358,6 +383,22 @@#3494fbhighlight-fill-button-hoverThe highlight color of the form header button on hover.
+" />
#FFE165highlight-fill-button-pressedThe background color of the pressed button from the form header.
+" />
#DFB500#fffborder-button-pressed-focusThe border color of the focused pressed button.
+" />
#848484