Merge branch 'development' into issue-82

README.md

@@ -59,6 +59,24 @@ Static settings are used on startup and cannot be changed while application is r
 | storage.createBucket                       | false              | Indicates whether bucket should be created on start-up                                                            
 | encryption.password                        | -                  | Password used for AES encryption                                                                                  
 | encryption.salt                            | -                  | Salt used for AES encryption                                                                                      
+| encryption.salt                            | -                  | Salt used for AES encryption                                                                                      
+| resources.maxSize                          | 1048576            | Max allowed size in bytes for a resource
+| resources.syncPeriod                       | 60000              | Period in milliseconds, how frequently check for resources to sync
+| resources.syncDelay                        | 120000             | Delay in milliseconds for a resource to be written back in object storage after last modification
+| resources.syncBatch                        | 4096               | How many resources to sync in one go
+| resources.cacheExpiration                  | 300000             | Expiration in milliseconds for synced resources in Redis
+| resources.compressionMinSize               | 256                | Compress a resource with gzip if its size in bytes more or equal to this value
+| redis.singleServerConfig.address           | -                  | Redis single server addresses, e.g. "redis://host:port"                                                                                        
+| redis.clusterServersConfig.nodeAddresses   | -                  | Json array with Redis cluster server addresses, e.g. ["redis://host1:port1","redis://host2:port2"]                                                                                        
+
+### Redis
+The Redis can be used as a cache with volatile-* eviction policies:
+```
+maxmemory 4G
+maxmemory-policy volatile-lfu
+```
+
+Note: Redis will be strictly required in the upcoming releases 0.7+.
 
 ### Dynamic settings
 

sample/aidial.settings.json

@@ -0,0 +1,37 @@
+{
+  "config": {
+    "files": ["/app/config/aidial.config.json"]
+  },
+  "redis": {
+    "singleServerConfig": {
+      "address": "redis://localhost:16370"
+    }
+  },
+  "identityProviders": {
+    "azure": {
+      "jwksUrl": "https://login.microsoftonline.com/path/discovery/keys",
+      "rolePath": "groups",
+      "issuerPattern": "^https:\\/\\/some\\.windows\\.net.+$"
+    },
+    "keycloak": {
+      "jwksUrl": "https://host.com/realms/your/protocol/openid-connect/certs",
+      "rolePath": "resource_access.your.roles",
+      "issuerPattern": "^https:\\/\\/some-keycloak.com.+$"
+    },
+    "test": {
+      "disableJwtVerification": true,
+      "rolePath": "role"
+    }
+  },
+  "storage": {
+    "provider" : "s3",
+    "endpoint" : "https://s3.endpoint:9000",
+    "identity": "access-key",
+    "credential": "secret-key",
+    "bucket": "your-bucket"
+  },
+  "encryption": {
+    "salt": "salt",
+    "password": "pass"
+  }
+}

src/main/resources/aidial.settings.json

@@ -36,7 +36,7 @@
     "compressionSupported": true
   },
   "config": {
-    "files": ["aidial.config.json"],
+    "files": [],
     "reload": 60000
   },
   "identityProviders": {