# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1595704993 -7200
# Node ID b8c7519448d205da3e9797e9ce737e21e0c6f4c8
# Parent  b8598659a8a07e54e7fd37cad21d08d9ff46ba5e# Parent  5bb6bc85f99f9b05a6e34c81b71893461ad02c78
merge

diff -r b8598659a8a0 -r b8c7519448d2 Sphinx/source/plugins/mysql.rst
--- a/Sphinx/source/plugins/mysql.rst	Sat Jul 25 21:22:56 2020 +0200
+++ b/Sphinx/source/plugins/mysql.rst	Sat Jul 25 21:23:13 2020 +0200
@@ -99,6 +99,9 @@
       "Database" : "orthanc",
       "Username" : "orthanc",
       "Password" : "orthanc",
+      "EnableSsl" : false,     // force SSL connections
+      "SslVerifyServerCertificates": true, // verify server certificates if EnableSsl is true
+      "SslCACertificates": "", // path to CA certificates to validate servers
       "Lock" : true            // See section about Locking
     },
     "Plugins" : [
@@ -115,6 +118,14 @@
 UNIX (i.e. to instruct Orthanc not to use UNIX socket), the
 ``UnixSocket`` can be set to the empty string.
 
+**Remark:** To force using a TLS connection, you must set ``EnableSsl``
+to ``true``.  Once ``EnableSsl`` is ``true``, the ``SslVerifyServerCertificates``
+enables the check of server certificates (``true`` by default).
+The CA certificates used to verify the server certificate can be defined
+through ``SslCACertificates``; if not defined or empty, the value of the global
+Orthanc configuration ``HttpsCACertificates`` is used.  These options have been
+introduced in the mainline in July 2020 and have not yet been released.
+
 **Remark:** When using the ``Storage`` MySQL plugin, the DICOM files
 are stored as blobs in the database. This might actually consume more
 space than the DICOM file itself.
diff -r b8598659a8a0 -r b8c7519448d2 Sphinx/source/plugins/object-storage.rst
--- a/Sphinx/source/plugins/object-storage.rst	Sat Jul 25 21:22:56 2020 +0200
+++ b/Sphinx/source/plugins/object-storage.rst	Sat Jul 25 21:23:13 2020 +0200
@@ -121,9 +121,22 @@
   	"BucketName": "test-orthanc-s3-plugin",
     "Region" : "eu-central-1",
     "AccessKey" : "AKXXX",
-    "SecretKey" : "RhYYYY"
+    "SecretKey" : "RhYYYY",
+    "Endpoint": "",                 // optional - currently in mainline version only: custom endpoint
+    "ConnectionTimeout": 30,        // optional - currently in mainline version only: connection timeout in seconds
+    "RequestTimeout": 1200          // optional - currently in mainline version only: request timeout in seconds (max time to upload/download a file)
   }
 
+The **EndPoint** configuration is used when accessing an S3 compatible cloud provider.  I.e. here is a configuration to store data on Scaleway::
+
+ "AwsS3Storage" : {
+    "BucketName": "test-orthanc",
+    "Region": "fr-par",
+    "AccessKey": "XXX",
+    "SecretKey": "YYY",
+    "Endpoint": "s3.fr-par.scw.cloud"
+  },
+
 Azure Blob Storage plugin
 ^^^^^^^^^^^^^^^^^^^^^^^^^