Updated settings REST API

resources/config/directory/imap.toml

@@ -4,7 +4,7 @@
 
 [directory."imap"]
 type = "imap"
-address = "127.0.0.1"
+host = "127.0.0.1"
 port = 993
 disable = true
 
@@ -17,7 +17,7 @@ wait = "30s"
 recycle = "30s"
 
 [directory."imap".tls]
-implicit = true
+enable = true
 allow-invalid-certs = true
 
 [directory."imap".cache]

resources/config/directory/ldap.toml

@@ -4,7 +4,7 @@
 
 [directory."ldap"]
 type = "ldap"
-address = "ldap://localhost:389"
+url = "ldap://localhost:389"
 base-dn = "dc=example,dc=org"
 timeout = "30s"
 disable = true
@@ -50,7 +50,7 @@ domains = "(&(|(objectClass=posixAccount)(objectClass=posixGroup))(|(mail=*@?)(m
 
 [directory."ldap".attributes]
 name = "uid"
-type = "objectClass"
+class = "objectClass"
 description = ["principalName", "description"]
 secret = "userPassword"
 groups = ["memberOf", "otherGroups"]

resources/config/directory/lmtp.toml

@@ -4,7 +4,7 @@
 
 [directory."lmtp"]
 type = "lmtp"
-address = "127.0.0.1"
+host = "127.0.0.1"
 port = 11200
 disable = true
 
@@ -21,7 +21,7 @@ wait = "30s"
 recycle = "30s"
 
 [directory."lmtp".tls]
-implicit = false
+enable = false
 allow-invalid-certs = true
 
 [directory."lmtp".cache]

resources/config/directory/memory.toml

@@ -16,14 +16,14 @@ subaddressing = true
 
 [[directory."memory".principals]]
 name = "admin"
-type = "admin"
+class = "admin"
 description = "Superuser"
 secret = "changeme"
 email = ["postmaster@%{DEFAULT_DOMAIN}%"]
 
 [[directory."memory".principals]]
 name = "john"
-type = "individual"
+class = "individual"
 description = "John Doe"
 secret = "12345"
 email = ["john@%{DEFAULT_DOMAIN}%", "jdoe@%{DEFAULT_DOMAIN}%", "john.doe@%{DEFAULT_DOMAIN}%"]
@@ -32,7 +32,7 @@ member-of = ["sales"]
 
 [[directory."memory".principals]]
 name = "jane"
-type = "individual"
+class = "individual"
 description = "Jane Doe"
 secret = "abcde"
 email = ["jane@%{DEFAULT_DOMAIN}%", "jane.doe@%{DEFAULT_DOMAIN}%"]
@@ -41,7 +41,7 @@ member-of = ["sales", "support"]
 
 [[directory."memory".principals]]
 name = "bill"
-type = "individual"
+class = "individual"
 description = "Bill Foobar"
 secret = "$2y$05$bvIG6Nmid91Mu9RcmmWZfO5HJIMCT8riNW0hEp8f6/FuA2/mHZFpe"
 quota = 50000000
@@ -50,10 +50,10 @@ email-list = ["info@%{DEFAULT_DOMAIN}%"]
 
 [[directory."memory".principals]]
 name = "sales"
-type = "group"
+class = "group"
 description = "Sales Team"
 
 [[directory."memory".principals]]
 name = "support"
-type = "group"
+class = "group"
 description = "Support Team"

resources/config/directory/sql.toml

@@ -20,7 +20,7 @@ entries = 500
 ttl = {positive = '1h', negative = '10m'}
 
 [directory."sql".columns]
-type = "type"
+class = "type"
 secret = "secret"
 description = "description"
 quota = "quota"

resources/config/imap/settings.toml

@@ -20,6 +20,3 @@ idle = "30m"
 [imap.rate-limit]
 requests = "2000/1m"
 concurrent = 6
-
-[imap.protocol]
-uidplus = false

resources/config/smtp/listener.toml

@@ -16,6 +16,6 @@ bind = ["[::]:465"]
 protocol = "smtp"
 tls.implicit = true
 
-[server.listener."management"]
-bind = ["127.0.0.1:8080"]
-protocol = "http"
+#[server.listener."management"]
+#bind = ["127.0.0.1:8080"]
+#protocol = "http"

resources/config/store/foundationdb.toml

@@ -4,15 +4,17 @@
 
 [store."foundationdb"]
 type = "foundationdb"
-#path = "/etc/foundationdb/fdb.cluster"
+#cluster-file = "/etc/foundationdb/fdb.cluster"
 disable = true
 
 #[store."foundationdb".transaction]
 #timeout = "5s"
 #retry-limit = 10
 #max-retry-delay = "1s"
-#machine-id = "stalwart"
-#data-center-id = "my-datacenter"
+
+#[store."foundationdb".ids]
+#machine = "stalwart"
+#data-center = "my-datacenter"
 
 [store."foundationdb".purge]
 frequency = "0 3 *"

resources/config/store/mysql.toml

@@ -11,9 +11,7 @@ user = "root"
 password = "password"
 disable = true
 #max-allowed-packet = 1073741824
-
-#[store."mysql".timeout]
-#wait = "15s"
+timeout = "15s"
 
 #[store."mysql".pool]
 #max-connections = 10

resources/config/store/postgresql.toml

@@ -9,11 +9,9 @@ port = 5432
 database = "stalwart"
 user = "postgres"
 password = "mysecretpassword"
+timeout = "15s"
 disable = true
 
-[store."postgresql".timeout]
-connect = "15s"
-
 [store."postgresql".tls]
 enable = false
 allow-invalid-certs = false

resources/config/store/redis.toml

@@ -4,13 +4,15 @@
 
 [store."redis"]
 type = "redis"
-url = "redis://127.0.0.1"
-#urls = ["redis://192.168.1.1", "redis://192.168.1.1"] # for Redis cluster
-username = "my_username"
+redis-type = "single"
+urls = ["redis://127.0.0.1"] 
+user = "my_username"
 password = "secretpassword"
 timeout = "10s"
-#retries = 3
-#max-retry-wait = "1s"
-#min-retry-wait = "500ms"
 #read-from-replicas = false
 disable = true
+
+#[store."redis".retry]
+#total = 3
+#max-wait = "1s"
+#min-wait = "500ms"