Merge branch 'master' of github.com:mailcow/mailcow-dockerized

data/conf/dovecot/dovecot.conf

@@ -130,6 +130,24 @@ namespace inbox {
   mailbox "Verwijderde items" {
     special_use = \Trash
   }
+  mailbox "Удаленные" {
+    special_use = \Trash
+  }
+  mailbox "Удаленные элементы" {
+    special_use = \Trash
+  }
+  mailbox "Корзина" {
+    special_use = \Trash
+  }
+  mailbox "Видалені" {
+    special_use = \Trash
+  }
+  mailbox "Видалені елементи" {
+    special_use = \Trash
+  }
+  mailbox "Кошик" {
+    special_use = \Trash
+  }
   mailbox "废件箱" {
     special_use = \Trash
   }
@@ -167,6 +185,12 @@ namespace inbox {
   mailbox "归档" {
     special_use = \Archive
   }
+  mailbox "Архив" {
+    special_use = \Archive
+  }
+  mailbox "Архів" {
+    special_use = \Archive
+  }
   mailbox "Sent" {
     auto = subscribe
     special_use = \Sent
@@ -186,6 +210,18 @@ namespace inbox {
   mailbox "已发送邮件" {
     special_use = \Sent
   }
+  mailbox "Отправленные" {
+    special_use = \Sent
+  }
+  mailbox "Отправленные элементы" {
+    special_use = \Sent
+  }
+  mailbox "Надіслані" {
+    special_use = \Sent
+  }
+  mailbox "Надіслані елементи" {
+    special_use = \Sent
+  }
   mailbox "Gesendet" {
     special_use = \Sent
   }
@@ -235,6 +271,12 @@ namespace inbox {
   mailbox "草稿箱" {
     special_use = \Drafts
   }
+  mailbox "Черновики" {
+    special_use = \Drafts
+  }
+  mailbox "Чернетки" {
+    special_use = \Drafts
+  }
   mailbox "Junk" {
     auto = subscribe
     special_use = \Junk
@@ -266,6 +308,15 @@ namespace inbox {
   mailbox "垃圾箱" {
     special_use = \Junk
   }
+  mailbox "Нежелательная почта" {
+    special_use = \Junk
+  }
+  mailbox "Спам" {
+    special_use = \Junk
+  }
+  mailbox "Небажана пошта" {
+    special_use = \Junk
+  }
   mailbox "Koncepty" {
     special_use = \Drafts
   }
@@ -331,6 +382,7 @@ service auth {
     mode = 0600
     user = vmail
   }
+  vsz_limit = 2G
 }
 service managesieve-login {
   inet_listener sieve {

data/conf/rspamd/local.d/composites.conf

@@ -56,6 +56,9 @@ BOUNCE_FUZZY {
 }
 # Remove bayes ham if fuzzy denied
 FUZZY_HAM_MISMATCH {
-  expression = "(-FUZZY_DENIED | -MAILCOW_FUZZY_DENIED | -LOCAL_FUZZY_DENIED) & (^BAYES_HAM | ^NEURAL_HAM_LONG | ^NEURAL_HAM_SHORT)";
-  score = 1.0;
+  expression = "( -FUZZY_DENIED | -MAILCOW_FUZZY_DENIED | -LOCAL_FUZZY_DENIED ) & ( ^BAYES_HAM | ^NEURAL_HAM_LONG | ^NEURAL_HAM_SHORT )"
+}
+# Remove bayes spam if local fuzzy white
+FUZZY_SPAM_MISMATCH {
+  expression = "( -LOCAL_FUZZY_WHITE ) & ( ^BAYES_SPAM | ^NEURAL_SPAM_LONG | ^NEURAL_SPAM_SHORT )"
 }