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

Merge remote-tracking branch 'remotes/origin/release/v8.0.0' into develop

Browse Source 
# Conflicts:
#	Common/sources/storage-fs.js
#	DocService/package.json
#	DocService/sources/DocsCoServer.js
#	DocService/sources/databaseConnectors/connectorUtilities.js
#	DocService/sources/databaseConnectors/postgreConnector.js
#	DocService/sources/gc.js
#	DocService/sources/mySqlBaseConnector.js
#	DocService/sources/wopiClient.js
This commit is contained in:
Sergey Konovalov
2024-02-05 14:43:02 +03:00
parent 0d5b1097ee 0521e77a61
commit b6b113285b
14 changed files with 181 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Common/sources/storage-s3.js
View File

@ -74,8 +74,8 @@ let configS3 = {
};
if (configS3.endpoint) {
configS3.sslEnabled = cfgSslEnabled;
configS3.s3ForcePathStyle = cfgS3ForcePathStyle;
configS3.tls = cfgSslEnabled;
configS3.forcePathStyle = cfgS3ForcePathStyle;
}
const client = new S3Client(configS3);