{man,}/vmm.cfg: Updated vmm.cfg to match VMM/config.
--- a/man/man5/vmm.cfg.5 Tue Feb 11 22:55:28 2014 +0000
+++ b/man/man5/vmm.cfg.5 Tue Feb 11 23:03:58 2014 +0000
@@ -1,4 +1,4 @@
-.TH "VMM.CFG" "5" "2013-02-10" "vmm 0.7" "vmm"
+.TH "VMM.CFG" "5" "2014-02-11" "vmm 0.7" "vmm"
.SH NAME
vmm.cfg \- configuration file for vmm
.\" -----------------------------------------------------------------------
@@ -68,7 +68,7 @@
pass = xxxxxxxx
[misc]
-dovecot_version = 1.2.16
+dovecot_version = 2.2.11
.fi
.\" -----------------------------------------------------------------------
.SH SEARCH ORDER
@@ -165,32 +165,21 @@
.B bin
section is used to specify some paths to some binaries required by
.BR vmm (1).
-.SS bin.dovecotpw
-.BR dovecotpw " (default: /usr/sbin/dovecotpw) :"
+.SS bin.doveadm
+.BR doveadm " (default: /usr/bin/doveadm) :"
.I String
.PP
The absolute path to the
-.BR dovecotpw (1)
+.BR doveadm (1)
binary.
-Use the absolute path to the
-.BR doveadm (1)
-binary, if you are using Dovecot v2.0.
.PP
This binary is used to generate a password hash, if
.I misc.password_scheme
-is set to one of `CRAM\-MD5', `HMAC\-MD5', `LANMAN', `OTP', `RPA' or
-`SKEY'.
+is set to one of `CRAM\-MD5', `HMAC\-MD5', `LANMAN', `OTP', `RPA',
+`SCRAM-SHA-1' or `SKEY'.
This binary will be also required if your Python installation doesn't
-support the:
-.IP \(bu 4
-md4 hash algorithm (hashlib + OpenSSL or PyCrypto) used for the password
-schemes: `PLAIN\-MD4' and `NTLM'
-.IP \(bu
-sha256 hash algorithm (hashlib or PyCrypto \(>= 2.1.0alpha1) used for the
-password schemes: `SHA256' and `SSHA256'
-.IP \(bu
-sha512 hash algorithm (hashlib) used for the password schemes: `SHA512' and
-`SSHA512'
+support the md4 hash algorithm (hashlib + OpenSSL) used for the password
+schemes `PLAIN\-MD4' and `NTLM'.
.PP
The
.BR doveadm (1)
@@ -376,10 +365,10 @@
Determines whether newly created users can log in via SMTP (SMTP AUTH).
.\" ------------------------------------
.SS domain.transport
-.BR transport " (default: dovecot:) :"
+.BR transport " (default: lmtp:unix:private/dovecot\-lmtp) :"
.I String
.PP
-Default transport for domains and accounts.
+Default transport for new domains.
For details see
.BR transport (5).
.\" -----------------------------------------------------------------------
@@ -531,9 +520,6 @@
password_length = 10
random_password = true
-[bin]
-dovecotpw = /usr/bin/doveadm
-
[database]
host = dbsrv8.example.net
pass = PY_SRJ}L/0p\-oOk
@@ -544,14 +530,13 @@
[domain]
quota_bytes = 500M
quota_messages = 10000
-transport = lmtp:unix:private/dovecot\-lmtp
[mailbox]
folders = Drafts:Sent:Templates:Trash:Lists.Dovecot:Lists.Postfix
[misc]
crypt_sha512_rounds = 10000
-dovecot_version = 2.0.beta4
+dovecot_version = 2.2.11
password_scheme = SHA512\-CRYPT.hex
.fi
.\" -----------------------------------------------------------------------
--- a/vmm.cfg Tue Feb 11 22:55:28 2014 +0000
+++ b/vmm.cfg Tue Feb 11 23:03:58 2014 +0000
@@ -102,9 +102,8 @@
;
; With Dovecot >= v2.0.0 it's strongly recommended that you use Dovecot's
; lmtp instead of the dovecot-lda.
-;transport = lmtp:unix:private/dovecot-lmtp
-; default transport for domains and accounts (String)
-transport = dovecot:
+; default transport for new created domains (String)
+transport = lmtp:unix:private/dovecot-lmtp
#
# Account settings
@@ -127,8 +126,8 @@
# external binaries
#
[bin]
-; location of dovecotpw (Dovecot v1) or doveadm (Dovecot v2) (String)
-dovecotpw = /usr/sbin/dovecotpw
+; location of doveadm (String)
+doveadm = /usr/bin/doveadm
; location of disk usage (String)
du = /usr/bin/du
; location of postconf (String)