Move the defaults for folders to automatically create, primary and secondary recipient email address policies to the main [kolab] section

1 files changed, 99 insertions, 87 deletions

diff --git a/conf/kolab.conf b/conf/kolab.conf
index f79d245..c84f4bb 100644
--- a/conf/kolab.conf
+++ b/conf/kolab.conf
@@ -22,6 +22,105 @@ default_locale = en_US
 ; deployments that lack persistent search and syncrepl ldap controls.
 sync_interval = 300
 
+; Primary and secondary recipient address policies. This is called the
+; recipient policy as documented in:
+; 
+;   http://docs.kolab.org/administrator-guide/configuring-the-kolab-server.html#recipient-policy
+;
+; Note this is the global default, and each [$domain] section can have
+; their own (as in this default configuration, see [example.org]).
+primary_mail = %(surname)s@%(domain)s
+secondary_mail = {
+        0: {
+                "{0}.{1}@{2}": "format('%(givenname)s'[0:1].capitalize(), '%(surname)s', '%(domain)s')"
+            },
+        1: {
+                "{0}@{1}": "format('%(uid)s', '%(domain)s')"
+            },
+        2: {
+                "{0}@{1}": "format('%(givenname)s.%(surname)s', '%(domain)s')"
+        }
+    }
+
+; A global default for folders to create in addition to the INBOX
+; folder.
+autocreate_folders = {
+        'Archive': {
+                'quota': 0
+            },
+        'Calendar': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "event.default",
+                        '/shared/vendor/kolab/folder-type': "event",
+                    },
+            },
+        'Calendar/Personal Calendar': {
+                'annotations': {
+                        '/shared/vendor/kolab/folder-type': "event",
+                    },
+            },
+        'Configuration': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "configuration.default",
+                        '/shared/vendor/kolab/folder-type': "configuration.default",
+                    },
+            },
+        'Contacts': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "contact.default",
+                        '/shared/vendor/kolab/folder-type': "contact",
+                },
+            },
+        'Contacts/Personal Contacts': {
+                'annotations': {
+                        '/shared/vendor/kolab/folder-type': "contact",
+                    },
+            },
+        'Drafts': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "mail.drafts",
+                    },
+            },
+        'Files': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "file.default",
+                    },
+            },
+        'Journal': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "journal.default",
+                        '/shared/vendor/kolab/folder-type': "journal",
+                    },
+            },
+        'Notes': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': 'note.default',
+                        '/shared/vendor/kolab/folder-type': 'note',
+                    },
+            },
+        'Sent': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "mail.sentitems",
+                    },
+            },
+        'Spam': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "mail.junkemail",
+                    },
+            },
+        'Tasks': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "task.default",
+                        '/shared/vendor/kolab/folder-type': "task",
+                    },
+            },
+        'Trash': {
+                'annotations': {
+                        '/private/vendor/kolab/folder-type': "mail.wastebasket",
+                    },
+            },
+    }
+
 [ldap]
 ; The URI to LDAP
 ldap_uri = ldap://localhost:389
@@ -225,91 +324,4 @@ footer_html = /etc/kolab/footer.html
 [example.org]
 default_quota = 1048576
 primary_mail = %(givenname)s.%(surname)s@%(domain)s
-secondary_mail = {
-        0: {
-                "{0}.{1}@{2}": "format('%(givenname)s'[0:1].capitalize(), '%(surname)s', '%(domain)s')"
-            },
-        1: {
-                "{0}@{1}": "format('%(uid)s', '%(domain)s')"
-            },
-        2: {
-                "{0}@{1}": "format('%(givenname)s.%(surname)s', '%(domain)s')"
-        }
-    }
 
-autocreate_folders = {
-        'Archive': {
-                'quota': 0
-            },
-        'Calendar': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': "event.default",
-                        '/shared/vendor/kolab/folder-type': "event",
-                    },
-            },
-        'Calendar/Personal Calendar': {
-                'annotations': {
-                        '/shared/vendor/kolab/folder-type': "event",
-                    },
-            },
-        'Configuration': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': "configuration.default",
-                        '/shared/vendor/kolab/folder-type': "configuration.default",
-                    },
-            },
-        'Contacts': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': "contact.default",
-                        '/shared/vendor/kolab/folder-type': "contact",
-                },
-            },
-        'Contacts/Personal Contacts': {
-                'annotations': {
-                        '/shared/vendor/kolab/folder-type': "contact",
-                    },
-            },
-        'Drafts': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': "mail.drafts",
-                    },
-            },
-        'Files': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': "file.default",
-                    },
-            },
-        'Journal': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': "journal.default",
-                        '/shared/vendor/kolab/folder-type': "journal",
-                    },
-            },
-        'Notes': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': 'note.default',
-                        '/shared/vendor/kolab/folder-type': 'note',
-                    },
-            },
-        'Sent': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': "mail.sentitems",
-                    },
-            },
-        'Spam': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': "mail.junkemail",
-                    },
-            },
-        'Tasks': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': "task.default",
-                        '/shared/vendor/kolab/folder-type': "task",
-                    },
-            },
-        'Trash': {
-                'annotations': {
-                        '/private/vendor/kolab/folder-type': "mail.wastebasket",
-                    },
-            },
-    }