--- a/vmm.cfg	Mon Jan 04 22:35:07 2010 +0000
+++ b/vmm.cfg	Wed Jan 13 00:08:44 2010 +0000
@@ -12,52 +12,60 @@
 user = dbuser
 ; Database password (String)
 pass = dbpassword
-; database name (String)
+; Database name (String)
 name = mailsys
 
 #
-# Mail directories
+# Maildir folder
 #
 [maildir]
 ; Default name of the Maildir folder (String)
 name = Maildir
 ; A colon separated list of folder names, that should be created (String)
-; e.g.: folders = Drafts:Sent:Templates:Trash
+; e.g.: folders = Drafts:Sent:Templates:Trash:Lists.Dovecot:Lists.Postfix
 folders = Drafts:Sent:Templates:Trash
-; Permissions for maildirs (Int)
-; octal 0700 -> decimal 448
-mode = 448
-; Display disk usage in account info by default? (Boolean)
-diskusage = false
-; Delete maildir recursive when deleting an account? (Boolean)
-delete = false
+
+#
+# Domain settings
+#
+[domain]
+; Should vmm create the postmaster account when a new domain is created?
+; (Boolean)
+auto_postmaster = true
+; Delete domain directory recursive when deleting a domain? (Boolean)
+delete_directory = false
+; Permissions for domain directories (Int)
+; octal 0770 -> decimal 504
+directory_mode = 504
+; Force deletion of accounts and aliases when deleting a domain (Boolean)
+force_del = false
 
 #
-# Services per user
+# Account settings
 #
-[services]
-; allow smtp by default? (Boolean)
+[account]
+; Delete the user's home directory recursive when deleting an account? (Boolean)
+delete_directory = false
+; Permissions for the user's home directory and mail directories (Int)
+; octal 0700 -> decimal 448
+directory_mode = 448
+; Display disk usage in account info by default? (Boolean)
+disk_usage = false
+; Should vmm generate a random password when no password was given for the
+; useradd subcommand? (Boolean)
+random_password = false
+; How many characters to include in the generated passwords? (Int)
+password_len = 8
+; Allow smtp by default? (Boolean)
 smtp = true
-; allow pop3 by default? (Boolean)
+; Allow pop3 by default? (Boolean)
 pop3 = true
-; allow imap by default? (Boolean)
+; Allow imap by default? (Boolean)
 imap = true
-; allow managesieve by default? (Boolean)
+; Allow managesieve by default? (Boolean)
 sieve = true
 
 #
-# domain directory settings
-#
-[domdir]
-; The base directory for all domains/accounts (String)
-base = /srv/mail
-; Permissions for domain directories (Int)
-; octal 0770 -> decimal 504
-mode = 504
-; Delete domain directory recursive when deleting a domain? (Boolean)
-delete = false
-
-#
 # external binaries
 #
 [bin]
@@ -72,17 +80,17 @@
 # misc settings
 #
 [misc]
+; The base directory for all domains/accounts (String)
+base_dir = /srv/mail
 ; Password scheme to use (see also: dovecotpw -l) (String)
-passwdscheme = PLAIN
+password_scheme = PLAIN
 ; numeric group ID of group mail (mail_privileged_group from dovecot.conf) (Int)
 gid_mail = 8
-; force deletion of accounts and aliases (Boolean)
-forcedel = false
-; default transport for domains and accounts
+; default transport for domains and accounts (String)
 transport = dovecot:
 ; the concatenated major and minor version number from `dovecot --version` (Int)
 ; e.g. 1.0.15 -> 10; 1.1.18 -> 11; 1.2.3 -> 12
-dovecotvers = 11
+dovecot_vers = 11
 
 #
 # Configuration state