Make the virtual mailboxes visible under RoundCube.

RoundCubes lists subscribed mailboxes only (determined using
LIST-EXTENDED by default); also, it seems to ignore new subscriptions to
mailboxes not listed by the LIST command.

7 files changed, 21 insertions, 26 deletions

diff --git a/roles/IMAP/files/etc/dovecot/conf.d/10-mail.conf b/roles/IMAP/files/etc/dovecot/conf.d/10-mail.conf
index 2c5f34f..9c24645 100644
--- a/roles/IMAP/files/etc/dovecot/conf.d/10-mail.conf
+++ b/roles/IMAP/files/etc/dovecot/conf.d/10-mail.conf
@@ -81,8 +81,9 @@ namespace virtual {
   prefix = virtual/
   separator = /
   location = virtual:/etc/dovecot/virtual:INDEX=~/virtual
-  list = no
+  list = yes
   hidden = no
+  subscriptions = no
 }
 
 # Example shared namespace configuration
diff --git a/roles/IMAP/files/etc/dovecot/conf.d/15-mailboxes.conf b/roles/IMAP/files/etc/dovecot/conf.d/15-mailboxes.conf
index e110f28..6aa5c22 100644
--- a/roles/IMAP/files/etc/dovecot/conf.d/15-mailboxes.conf
+++ b/roles/IMAP/files/etc/dovecot/conf.d/15-mailboxes.conf
@@ -16,19 +16,19 @@ namespace inbox {
   #}
 
   # These mailboxes are widely used and could perhaps be created automatically:
-  mailbox TRASH {
+  mailbox Trash {
     auto = create
     special_use = \Trash
   }
-  mailbox DRAFTS {
+  mailbox Drafts {
     auto = create
     special_use = \Drafts
   }
-  mailbox SENT {
+  mailbox Sent {
     auto = subscribe
     special_use = \Sent
   }
-  mailbox SPAM {
+  mailbox Junk {
     auto = create
     special_use = \Junk
   }
diff --git a/roles/IMAP/files/etc/dovecot/conf.d/90-plugin.conf b/roles/IMAP/files/etc/dovecot/conf.d/90-plugin.conf
index 6e60f0f..aed06c0 100644
--- a/roles/IMAP/files/etc/dovecot/conf.d/90-plugin.conf
+++ b/roles/IMAP/files/etc/dovecot/conf.d/90-plugin.conf
@@ -9,9 +9,9 @@
 plugin {
   antispam_backend = spool2dir
 
-  antispam_trash = TRASH
+  antispam_trash = Trash
   antispam_unsure_pattern_ignorecase = MailTrain;MailTrain/*
-  antispam_spam = SPAM
+  antispam_spam = Junk
 
   # The first %%lu is replaced by the current time.
   # The second %%lu is replaced by a counter to generate unique names.
diff --git a/roles/IMAP/files/etc/dovecot/virtual/all/dovecot-virtual b/roles/IMAP/files/etc/dovecot/virtual/all/dovecot-virtual
index 98e5192..31d3e06 100644
--- a/roles/IMAP/files/etc/dovecot/virtual/all/dovecot-virtual
+++ b/roles/IMAP/files/etc/dovecot/virtual/all/dovecot-virtual
@@ -1,8 +1,6 @@
 !INBOX
--JUNK
--JUNK/*
--SPAM
--SPAM/*
--TRASH
+-Junk
+-Junk/*
+-Trash
 *
-  all
+  ALL
diff --git a/roles/IMAP/files/etc/dovecot/virtual/flagged/dovecot-virtual b/roles/IMAP/files/etc/dovecot/virtual/flagged/dovecot-virtual
index 883f49e..18845c6 100644
--- a/roles/IMAP/files/etc/dovecot/virtual/flagged/dovecot-virtual
+++ b/roles/IMAP/files/etc/dovecot/virtual/flagged/dovecot-virtual
@@ -1,2 +1,2 @@
 *
-  flagged
+  FLAGGED
diff --git a/roles/IMAP/files/etc/dovecot/virtual/recent/dovecot-virtual b/roles/IMAP/files/etc/dovecot/virtual/recent/dovecot-virtual
index 9c9a7e8..601ce28 100644
--- a/roles/IMAP/files/etc/dovecot/virtual/recent/dovecot-virtual
+++ b/roles/IMAP/files/etc/dovecot/virtual/recent/dovecot-virtual
@@ -1,7 +1,5 @@
--JUNK
--JUNK/*
--SPAM
--SPAM/*
--TRASH
+-Junk
+-Junk/*
+-Trash
 *
    YOUNGER 2592000
diff --git a/roles/IMAP/files/etc/dovecot/virtual/unseen/dovecot-virtual b/roles/IMAP/files/etc/dovecot/virtual/unseen/dovecot-virtual
index c5c09fc..3dc4a3b 100644
--- a/roles/IMAP/files/etc/dovecot/virtual/unseen/dovecot-virtual
+++ b/roles/IMAP/files/etc/dovecot/virtual/unseen/dovecot-virtual
@@ -1,8 +1,6 @@
--DRAFTS
--JUNK
--JUNK/*
--SPAM
--SPAM/*
--TRASH
+-Drafts
+-Junk
+-Junk/*
+-Trash
 *
-  unseen
+  UNSEEN