Branch 'pykolab-0.5' - conf/kolab.conf

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Tue Sep 4 12:09:04 CEST 2012


 conf/kolab.conf |   42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

New commits:
commit 8a917659e27d152a59ae2be378d6888d024e519a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sat Sep 1 16:29:49 2012 +0100

    Update the default autocreate_folders to 1) include the namespace to set the annotation in, 2) conform with http://wiki.kolab.org/Kolab_3.0_Storage_Format#Annotations

diff --git a/conf/kolab.conf b/conf/kolab.conf
index d20b9b7..02d301d 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -227,74 +227,68 @@ autocreate_folders = {
             },
         'Calendar': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "event.default",
+                        '/private/vendor/kolab/folder-type': "event.default",
+                        '/shared/vendor/kolab/folder-type': "event",
                     },
             },
         'Calendar/Personal Calendar': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "event",
+                        '/shared/vendor/kolab/folder-type': "event",
                     },
             },
         'Configuration': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "configuration.default",
+                        '/private/vendor/kolab/folder-type': "configuration.default",
+                        '/shared/vendor/kolab/folder-type': "configuration.default",
                     },
             },
         'Drafts': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "mail.drafts",
+                        '/private/vendor/kolab/folder-type': "mail.drafts",
                     },
             },
         'Contacts': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "contact.default",
+                        '/private/vendor/kolab/folder-type': "contact.default",
+                        '/shared/vendor/kolab/folder-type': "contact",
                 },
             },
         'Contacts/Personal Contacts': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "contact",
+                        '/shared/vendor/kolab/folder-type': "contact",
                     },
             },
         'Journal': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "journal.default",
+                        '/private/vendor/kolab/folder-type': "journal.default",
+                        '/shared/vendor/kolab/folder-type': "journal",
                     },
             },
         'Notes': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': 'note.default',
+                        '/private/vendor/kolab/folder-type': 'note.default',
+                        '/shared/vendor/kolab/folder-type': 'note',
                     },
             },
         'Sent': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "mail.sentitems",
+                        '/private/vendor/kolab/folder-type': "mail.sentitems",
                     },
             },
         'Spam': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "mail.junkemail",
+                        '/private/vendor/kolab/folder-type': "mail.junkemail",
                     },
             },
         'Tasks': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "task.default",
+                        '/private/vendor/kolab/folder-type': "task.default",
+                        '/shared/vendor/kolab/folder-type': "task",
                     },
             },
         'Trash': {
                 'annotations': {
-                        '/vendor/kolab/folder-test': "true",
-                        '/vendor/kolab/folder-type': "mail.trash",
+                        '/private/vendor/kolab/folder-type': "mail.trash",
                     },
             },
     }





More information about the commits mailing list