--- a/vmm.cfg	Fri Feb 04 23:45:34 2011 +0000
+++ b/vmm.cfg	Sun Feb 06 23:17:47 2011 +0000
@@ -6,8 +6,24 @@
 # Database settings
 #
 [database]
+; The Python PostgreSQL database adapter module to be used (String)
+; Supported modules are:
+;    * psycopg2
+;    * pyPgSQL
+module = psycopg2
 ; Hostname or IP address of the database server (String)
 host = localhost
+; The TCP port, on which the database server is listening for connections (Int)
+port = 5432
+; SSL mode for the database connection (String)
+; Possible values are:
+;    * disabled
+;    * allow
+;    * prefer (default)
+;    * require
+;    * verify-ca (PostgreSQL >= 8.4)
+;    * verify-full (PostgreSQL >= 8.4)
+sslmode = prefer
 ; Database user name (String)
 user = dbuser
 ; Database password (String)
@@ -95,11 +111,27 @@
 [misc]
 ; The base directory for all domains/accounts (String)
 base_directory = /srv/mail
-; Password scheme to use (see also: dovecotpw -l) (String)
-password_scheme = CRAM-MD5
-; default transport for domains and accounts (String)
-transport = dovecot:
+; Number of encryption rounds for the password_scheme BLF-CRYPT (Int)
+crypt_blowfish_rounds = 5
+; Number of encryption rounds for the password_scheme SHA256-CRYPT (Int)
+crypt_sha256_rounds = 5000
+; Number of encryption rounds for the password_scheme SHA512-CRYPT (Int)
+crypt_sha512_rounds = 5000
 ; the version number from `dovecot --version` (String)
 ; e.g. 1.1.18; 1.2.11; 2.0.beta4
 dovecot_version = 1.2.11
+; Password scheme to use (see also: dovecotpw -l) (String)
+password_scheme = CRAM-MD5
+; Quota limit in bytes. 0 means unlimited (String)
+; The value can have one of the suffixes:
+;    * b: bytes
+;    * k: kilobytes
+;    * M: megabytes
+;    * G: gigabytes
+; 1024 is the same as 1024b or 1k
+quota_bytes = 0
+; Quota limit in number of messages. 0 means unlimited (Int)
+quota_messages = 0
+; default transport for domains and accounts (String)
+transport = dovecot: