Просмотр исходного кода

Merge pull request #1281 from eka7a/master

Warning: autocreate plugin is deprecated, use mailbox { auto } setting instead
Serghey Rodin 8 лет назад
Родитель
Сommit
f2371b8d4c
2 измененных файлов с 40 добавлено и 28 удалено
  1. 20 14
      install/rhel/6/dovecot/conf.d/20-imap.conf
  2. 20 14
      install/rhel/7/dovecot/conf.d/20-imap.conf

+ 20 - 14
install/rhel/6/dovecot/conf.d/20-imap.conf

@@ -3,18 +3,24 @@
 ##
 
 protocol imap {
-mail_plugins = $mail_plugins autocreate
-}
+  namespace inbox {
+    inbox = yes
 
-plugin {
-  autocreate = Trash
-  autocreate2 = Spam
-  autocreate3 = Sent
-  autocreate4 = Drafts
-  #autocreate5 = Custom
-  autosubscribe = Trash
-  autosubscribe2 = Spam
-  autosubscribe3 = Sent
-  autosubscribe4 = Drafts
-  #autosubscribe5 = Custom
-}
+    mailbox Trash {
+      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
+      special_use = \Trash
+    }
+    mailbox Sent {
+      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
+      special_use = \Sent
+    }
+    mailbox Spam {
+      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
+      special_use = \Junk
+    }
+    mailbox Drafts {
+      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
+      special_use = \Drafts
+    }
+  }
+}

+ 20 - 14
install/rhel/7/dovecot/conf.d/20-imap.conf

@@ -3,18 +3,24 @@
 ##
 
 protocol imap {
-mail_plugins = $mail_plugins autocreate
-}
+  namespace inbox {
+    inbox = yes
 
-plugin {
-  autocreate = Trash
-  autocreate2 = Spam
-  autocreate3 = Sent
-  autocreate4 = Drafts
-  #autocreate5 = Custom
-  autosubscribe = Trash
-  autosubscribe2 = Spam
-  autosubscribe3 = Sent
-  autosubscribe4 = Drafts
-  #autosubscribe5 = Custom
-}
+    mailbox Trash {
+      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
+      special_use = \Trash
+    }
+    mailbox Sent {
+      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
+      special_use = \Sent
+    }
+    mailbox Spam {
+      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
+      special_use = \Junk
+    }
+    mailbox Drafts {
+      auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values
+      special_use = \Drafts
+    }
+  }
+}