diff README.md @ 15:2a02b21f0a19

migration + storage structure
author Alain Mazy
date Tue, 01 Sep 2020 13:08:49 +0200
parents 393fcf337462
children 968eb1c78aed
line wrap: on
line diff
--- a/README.md	Wed Aug 26 12:52:37 2020 +0200
+++ b/README.md	Tue Sep 01 13:08:49 2020 +0200
@@ -10,14 +10,16 @@
 
 ```
 {
-    "StorageEncryption" : {
-        "Enable": true,
-        "MasterKey": [3, "/path/to/master.key"], // key id - path to the base64 encoded key
-        "PreviousMasterKeys" : [
-            [ 1, "/path/to/previous1.key"],
-            [ 2, "/path/to/previous2.key"]
-        ],
-        "MaxConcurrentInputSize" : 1024   // size in MB 
+    "GoogleCloudStorage" : {
+        "StorageEncryption" : {
+            "Enable": true,
+            "MasterKey": [3, "/path/to/master.key"], // key id - path to the base64 encoded key
+            "PreviousMasterKeys" : [
+                [ 1, "/path/to/previous1.key"],
+                [ 2, "/path/to/previous2.key"]
+            ],
+            "MaxConcurrentInputSize" : 1024   // size in MB 
+        }
     }
 }
 ```
@@ -29,14 +31,17 @@
 * `hg clone ...`
 * `mkdir -p build/google`
 * `cd build/google` 
-* `cmake -DCMAKE_TOOLCHAIN_FILE=[vcpkg root]\scripts\buildsystems\vcpkg.cmake ../../orthanc-object-storage/google`
+* `cmake -DCMAKE_TOOLCHAIN_FILE=[vcpkg root]\scripts\buildsystems\vcpkg.cmake ../../orthanc-object-storage/Google`
 
 ### Google plugin configuration ###
 
 ```
     "GoogleCloudStorage" : {
-        "ServiceAccountFile": "/.../googleServiceAccountFile.json",
-        "BucketName": "test-orthanc-storage-plugin"
+        "ServiceAccountFile" : "/.../googleServiceAccountFile.json",
+        "BucketName": "test-orthanc-storage-plugin",
+        "StorageEncryption" : {...},
+        "StorageStructure" : "flat",
+        "MigrationFromFileSystemEnabled" : false
     }
 
 ```
@@ -60,7 +65,10 @@
 ```
     "AzureBlobStorage" : {
     	"ConnectionString": "DefaultEndpointsProtocol=https;AccountName=xxxxxxxxx;AccountKey=yyyyyyyy===;EndpointSuffix=core.windows.net",
-    	"ContainerName" : "test-orthanc-storage-plugin"
+    	"ContainerName" : "test-orthanc-storage-plugin",
+        "StorageEncryption" : {...},
+        "StorageStructure" : "flat",
+        "MigrationFromFileSystemEnabled" : false
     }
 ```
 
@@ -103,6 +111,9 @@
         "SecretKey" : "RhYYYY",
         "Endpoint": "",                 // optional: custom endpoint
         "ConnectionTimeout": 30,        // optional: connection timeout in seconds
-        "RequestTimeout": 1200          // optional: request timeout in seconds (max time to upload/download a file)
+        "RequestTimeout": 1200,         // optional: request timeout in seconds (max time to upload/download a file)
+        "StorageEncryption" : {...},
+        "StorageStructure" : "flat",
+        "MigrationFromFileSystemEnabled" : false
     }
 ```
\ No newline at end of file