Added a README and the files of the empty vmm.git Simply `git pull` it.

Removed .hg* files

Removed files -> Git: `git clone https://bitbucket.org/pvo/vmm.git`

closed branch v0.7.x

VMM/handler: Avoid unnecessary method calls.

{man1,doc/web}: Updated userdelete's --delete-home -> --delete-directory.

VMM: Unified parameter names and option names. handler: Handler.user_delete() renamed parameter: delete_home -> del_dir The same as in Handler.domain_delete(). cli/subcommands: renamed userdelete's option --delete-home -> --delete-directory So people have to memorize only one option name. It also matches the setting names of vmm.cfg.

{man1,doc/web}: Added domaindelete --delete-directory's description.

VMM/cli/subcommands: domaindelete: Added option --delete-directory.

VMM/handler: Handler.domain_delete() Added parameter del_dir.

{man1,doc/web}: Added userdelete --delete-home's description.

VMM/cli/subcommands: userdelete: Added option --delete-home.

VMM/handler: Handler.user_delete() Added parameter `delete_home'.

merged changes from default(659c4476c57c).

po: Updated Finnish translation (translated by Jorma Karvonen).

po: Updated German translation (translated by Mario Blättermann).

merged changes from default(ef2b73d461d4).

po: Regenerated vmm.pot

VMM/cli/subcommands: Moved the TP comment to the right place.

merged changes from default(56346f2cb631).

po: Regenerated vmm.pot

VMM/cli/clihelp: Two small improvements: - Unified `wild card search' help messages. - Added a comment for xgettext, so it should no longer make a wrong decision about `python-format'.

merged changes from default(b65c3abf9ca8).

doc/web: dovecot_configuration: corrected 'user_query`.

{man1,doc/web}: Added description of userpassword's --hash option.

VMM/cli/subcommands: userpassword: Added option --hash. vmm userpassword --hash {SCHEME}$HASH can be used to save a password hash, e.g. generated by doveadm pw, as new user password.

VMM/handler: Added method Handler.user_pwhash.

VMM/account: Account.modify accepts a password hash.

merged changes from default(8c7eeb2bc139).

VMM/config: Corrected a setting name in an error msg.

Added a note about the usage of CRAM-MD5.

VMM/password: Added function extract_scheme().

{man1,doc/web}: Added description of userpassword's -s option.

VMM/cli/handler: Improved CliHandler.user_password. When possible check the given password scheme before prompting for the password.

VMM/cli/subcommands: userpassword added option -s. -s SCHEME can be used to (temporarily) override the password_scheme setting, configured in vmm.cfg.

VMM/{cli,}/handler: Adjusted Handler.user_password. Use Account.update_password instead of Account.modify.

VMM/account: Added method Account.update_password.

VMM/password: Dropped Dovecot v1 compatibility code.

pgsql/create_tables: Set default transport to lmtp.

pgsql: create_tables-dovecot-1.2.x.pgsql -> create_tables.pgsql

VMM/password: Renamed _dovecotpw() -> _doveadmpw()

VMM/mailbox: s/dovecotpw/doveadm/g PEP8 Fix: E127 in SingleDbox.__init__()

{man,}/vmm.cfg: Updated vmm.cfg to match VMM/config.

VMM/config: Updated default values for Dovecot ≥ 2.0.0 Renamed bin.dovecotpw -> bin.doveadm; default: /usr/bin/doveadm Updated domain.transport to lmtp:unix:private/dovecot-lmtp

doc/web: Replaced vmm.cfg by a symbolic link.

ext/postconf: Corrected a typo in a docstring.

VMM/config: Updated Dovecot version check. Renamed function check_version_format() -> check_dovecot_version(). Now this function checks also if misc.dovecot_version >= MIN_DOVECOT_VERSION.

VMM/constants: Added MIN_DOVECOT_VERSION (>= 2.0.0).

VMM/cli/handler: Updated `skip_some_checks' conditions.

VMM/cli: Make sure that there is at least one argument.

README: Updated/cleaned up dependences. Replaced `ccTLDs' by `IDN ccTLDs`. The same applies to doc/web.

Merged changes from default(5716bf441ceb).

Added signature for changeset 93b2f5859866

Added tag vmm-0.6.2 for changeset 93b2f5859866

Released vmm-0.6.2

UPGRADE: Added a note about upgrading from 0.6.1.

doc/web: Updated documentation for vmm-0.6.2.

update_config: Updated to work with version 0.6.1.

VMM/domain: RE_DOMAIN: Check Punycode TLDs more precise.

Updated copyright notices to include the year 2014.

VMM/handler: Improved domaininfo subcommand. Check all labels for ASCII-compatible encoding, not only the first one. If something is in ACE format, convert it to IDNA.

VMM/domain: Accept also ccTLDs and 'new' gTLDs.

Merged changes from default(4c8e15c2f01b)

doc/web: Removed layout.html template.

merged changes from default(61aaa7a98ec0).

doc/web: Added a note about using Dovecot's LMTP with Postfix. This solves issue #1.

VMM/serviceset: Small code cleanup.

{INSTALL,doc}: Updated documentation.

Dropped pyPgSQL support.

pgsql/set-permissions: use argparse instead of optparse.

pgsql: Removed files for Dovecot < 1.2.0.

VMM: Dropped support for Dovecot versions before v1.2.0.

doc: Updated doc/web and man1. Added description of the -d option for subcommands domainnote, username and usernote.

VMM/cli/subcommands: Avoid the accidentally deletion of values. Added the -d option to the subcommands domainnote, username and usernote.

man1: Deleted trailing whitespaces.

doc: Added description of {domain,user}add's -n option.

VMM: Added option `-n NOTE' to {domain,user}add.

VMM/cli/subcommands: domain_add: Fixed a coding error.

man1: Use service names in lowercase letters. Service names in uppercase letters will be rejected by the argument parser.

doc/web: Updated copyright and version info.

doc/web: Updated to reflect the new cli.

VMM: Code cleanup.

{install,upgrade}.sh: Removed disused code.

VMM/cli/subcommands: Rephrased two help messages.

man: Deleted German manual pages.

man1: Updated to reflect the new cli.

merged changes from default(d24f094d1cb5)

Updated copyright notices to include the year 2013.

VMM/config: Post-2to3 fix. PEP8-ified imports.

VMM: Post-2to3 fix. Use the re.ASCII flag for ASCII-only patterns. The local-part of an email address and Postfix configuration parameters may contain only ASCII characters.

VMM/network: Post-2to3 fix. s/addr.encode('hex')/b2a_hex(addr).

VMM/*: Post-2to3 fix. Updated some error messages/comments. Replaced `long' by `int' - part II.

VMM/*: Post-2to3 fix. Updated some error messages/comments. Replaced `long' by `int' (or integer).

VMM/cli/clihelp: Removed module clihelp. It's no longer needed. Online help is included in the subcommand module.

VMM/cli: Small cleanup.

VMM/constants: Removed constants, which are obsolete now.

VMM/cli/main: Adjusted to new argparse functionality.

VMM/cli/subcommands: Switched argument parsing over to argparse.

VMM/password: Added scheme CLEAR.

VMM/cli: Deleted unnecessary encode()s from read_pass.

merged changes from default(29295afafa91)

VMM/account: Fixed a typo in Account.delete(). Due to a wrong placed comma `userdelete … force' ended in a TypeError.

VMM/mailbox: Decode error messages from doveadm. Those errors occur only with the dbox mailbox format when the mailbox.folders contains non-ASCII mailbox names.

VMM/cli/config: … encode/decode …

VMM{/cli}/config: Explicitly pass utf-8 as the encoding to open().

VMM/cli/subcommands: Fixed some encode/decode issues.

VMM/cli/subcommands: Print usable password schemes in sorted order.

VMM/password: Code cleanups: - Rely no longer on Crypto.Hash for md4 support. Python's hashlib on FreeBSD, Linux and OpenBSD provides the md4 hash. - Dropped DIGEST-MD5 password hashing for Dovecot <= v1.1.12/v1.2.beta2

VMM/cli: Avoid UnicodeDecodeErrors with some „obsolete“ encodings.

VMM: Post-2to3 fixes. Added, (re)moved some (en|de)code() calls.

VMM: Post-2to3 fix. Don't pass 'str=1' ('unicode=1' before 2to3) to gettext.install().

VMM/password: Post-2to3 fixes. Replaced ….encode('hex') and ….encode('base64') by b64encode(…) and b2a_hex(…). Added some necessary encode() and decode() calls. Fixed NTLM hash generating with non ASCII characters.

VMM/config: s/_boolean_states/BOOLEAN_STATES/g

VMM/handler: Dropped psycopg2 typecaster registration.

VMM/handler: Reworked config file permission check.

merged changes from default(86c2ed36aba8)

po: Updated Finnish translation (translated by Jorma Karvonen).

Updated shebang to use python3 instead of python.

pgsql/set-permissions.py: Ran 2to3 from Python 3.2.3.

Ran 2to3 from Python 3.2.3.

Use the with statement for file operations.

VMM/config: Undone changeset 90d69ae4f40d.

VMM/cli/subcommands: Code cleanup in list_pwschemes().

setup.py: PEP-314-ified. Distutils setup() function now has the 'requires` keyword parameter.

VMM: Partial PEP-308-ification.

VMM: Removed module pycompat.

VMM/pycompat: Removed module hashlib.

doc/web: Updated OpenBSD's package names.

doc/web: Fixed a typo.

VMM/password: Added scheme SCRAM-SHA-1.

Documentation: Fixed dictionary quota URI.

install.sh: Don't fail if $SYSCONFDIR doesn't exist.

doc/web/ext_references: Fixed URL of pg_hba.conf.

doc/web: Added links to the Debian package and the git repos. README: Added git-URL.

Added tag vmm-0.6.1 for changeset 682431c45b24

Released vmm-0.6.1

doc/web: Updated documentation for vmm-0.6.1.

Add list* commands to manpages

UPGRADE: Added procedure for updating from v0.6.0.

update_config: Updated to work with version 0.6.0. Fixed some PEP8 related issues.

doc/web: Updated and extended documentation. Updated description of subcommands aliasdelete and catchalldelete. Added description of subcommands listaddresses, listaliases, listrelocated and listusers.

VMM/cli/clihelp: Added missing help messages. Added descriptions of subcommands listaddresses, listaliases, listrelocated and listusers.

po: Updated Dutch translation (translated by Erwin Poeze).

VMM/alias: Load destination addresses sorted. This produces sorted output for the aliasinfo subcommand.

VMM: {alias,catchall}delete: Accept multiple destinations.

po: Updated Dutch translation (translated by Erwin Poeze).

VMM/cli/main: Check if we have warnings before exiting. If so, print them and exit afterwards.

VMM/domain: Enabled transport-validation. Validate the transport also in Domain.set_transport() and Domain.update_transport().

VMM: Moved transport-validation to common.

VMM/account: Fixed account's transport check. Make sure that 'virtual:' isn't used as transport when the mailbox-format is set to mdbox or sdbox.

po: Updated Dutch translation (translated by Erwin Poeze).

PEP8: Fixed all PEP8 related issues.

po: Regenerated vmm.pot

Added a few comments for the Translation Project.

VMM: Corrected/updated some msgids. Unified some messages and corrected a few typos.

VMM/cli/subcommands: Corrected username's usage string. username's name argument is optional.

VMM/cli: Activated help subcommand. Implemented Command.help_(), which reads the command's help message from cli.clihelp.

VMM/handler: Fixed user{quota,services,transport} subcommands. The subcommands user{quota,services,transport} actually failed with the arguments '<address> domain'. This is part II of changeset a75923ce2842

doc/web: Added missing userservices description. Fixed order of subcommand listing.

man: Typo-fix.

VMM/cli/subcommands: Corrected two usage strings. domainnote's and usernote's note argument is optional.

VMM: Decode localized numbers to the current encoding. That avoids UnicodeDecodeErrors since locale.format(%d) may return localized numbers, which contain NO-BREAK SPACE as the thousands separator.

VMM/cli/subcommands: Don't mark empty strings as translatable. gettext('') returns the header entry with meta information, not the empty string.

doc/web: Added description 'Upgrade to Dovecot ≧ v1.2.beta2'.

pgsql: Added dovecot_update_v1.2+.pgsql. Use this file when you are upgrading your Dovecot installation to a version >= 1.2.beta2.

VMM/cli/subcommands: Reverted accidentally committed help() code.

pgsql/create_tables.pgsql: Eliminated two unnecessary differences. Yeah, cosmetic only.

pgsql: Don't select service_set.ssid in dovecotpassword() unconditional. This may cause an empty result, which will make logins impossible.

VMM/serviceset: Fixed a conditional ProgrammingError. Affects only setups with Dovecot < v1.2.beta2. Actually the SQL query in method ServiceSet._load_by_services wasn't updated. Removed unnecessary code, which would have also produced a ProgrammingError, if it would have been correct.

VMM/cli/subcommands: Added 'missing' newline below domain notes. This patch contains also a small code cleanup and PEP8-fix.

doc/web: Added the transport filed to the usertransport example.

doc/web: Added the 'Howto'. The reStructuredText version of vmm.1, in multiple parts.

man/{de/}man1: A few more corrections.

man/{de/}man1: Small corrections for domaininfo's description.

man/{de/}man5: s/Wiki/Homepage/g

man/{de/}man1: s/Wiki/Homepage/g

VMM/common: Improve search_address complexity Checking the dictionary (a hash) for existence of a key is likely to be O(log(n)), while checking a list is O(n). Therefore, to increase performance, this patch changes the check accordingly.

doc/web: Refreshed vmm.cfg

vmm.cfg: Updated/improved comments.

If an alias has multiple destinations, multiple records exist, due to the nature of the database. address_list would then return the same alias multiple times, which does not add any information, eats screen space and is potentially confusing. Therefore, we SELECT DISTINCTly from the alias table. Signed-off-by: martin f. krafft <madduck@debian.org> --- VirtualMailManager/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Due to the UNION query in address_list, the assumption that the list of gids received from the database would be continuous does not hold. To prevent addresses for domains with multiple entry types from being listed, it is necessary to check the list of domain gids for every entry. Signed-off-by: martin f. krafft <madduck@debian.org> --- VirtualMailManager/common.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

doc/web: Emphasized a few lines of Dovecot/PostgreSQL configuration file excerpts.

.hgignore: "doc/build" is no longer required.

doc: Added source of http://vmm.localdomain.org/.

doc: Moved API documentation to doc/api.

INSTALL: Updated PostgreSQL configuration URL. Use ${sql} and ${proxysql} expressions in the main.cf description.

README: Substituted a few words.

README: Updated URL of the hg repository@sf.net.

man: Deleted erroneous placed backslash.

Added tag vmm-0.6.0 for changeset 3238c58d01ae

Released vmm-0.6.0

Merged changes from v0.6.x(28230a8230bf).

Close v0.6.x branch.

vmm: Don't insert the module directory into sys.path by default. Doesn't make much sense, if the code is installed inside sys.path.

Updated copyright notices to include the year 2012.

TODO: Removed "listpwschemes" entry. Was done with changeset a64c1b5e08b4

UPGRADE: Updated documentation.

VMM/cli/subcommands: Replaced the keyword `default' by `domain'. Patch by Martin F. Krafft

INSTALL: Added description how to create additional dove* user/group. `doveauth' user and group for the authentication process and the group `dovemail' for mail related Dovecot processes.

INSTALL: Updated documentation.

Configure.Dovecot_2: Added configuration documentation for Dovecot_2 >= 2.0.

VMM: The Python 2.4.x compatibility commit - part III.

VMM/account: Check the account's transport only when we have a transport.

VMM: The Python 2.4.x compatibility commit.

pgsql/set-permissions.py: Extended permissions. Postfix needs read access on the postfix_gid view. Dovecot needs read permissions on both mailboxformat columns.

VMM/handler: Restored method Handler.domain_transport(). It went somehow lost with changeset 5806fb74130b.

pgsql: Added helper script: set-permissions.py.

Provide list{addresses,aliases,users,relocated} subcommands The patch provides the list{addresses,aliases,users,relocated} subcommands to the UI. All commands actually take the same path in the code and only one query is run with different parameters for each case. There are still two shortcomings: 1. With alias domains, the output order is not as one might want it, e.g. foo@example.org bar@example.org foo@example.com bar@example.com when it should really be foo@ twice and then bar@ twice. I have not found a way to modify the SQL accordingly. 2. The SELECT queries for Accounts, Alias and Relocated are hard-coded in common.py.

man: escape hyphens Hyphens inside words must be spelt \- instead of just -. This patch fixes up the manpages. * * * .

man: add 'catchall' to domaininfo Since the addition of catchall, the domaininfo subcommand can also take 'catchall' as a [detail] to limit the output of details to the catch-all aliases. Also, the number of catch-all destinations is now included in the simple domaininfo output.

man: vmm1: Use `fqdn' instead of `domain' in catchall* descriptions. Fixed a typo s/cadd/cad/. Replaced double quotes by \(dq.

VMM/cli/subcommands: Use the `fqdn' argument placeholder also for catch-all subcommands.

Fix transport_maps function for non-existent domains The postfix_transport_maps function had a bug causing 2012-04-15 17:40:22 CEST LOG: statement: SELECT transport FROM postfix_transport_map('logcheck', 'domine.madduck.net'); 2012-04-15 17:40:22 CEST ERROR: query returned no rows when the domain was not in the database. This would make did be NULL and make the query fail. This patch moves the tid query until after a check for did. If the latter is NULL, the function RETURNs (rather than fails).

Revert caching of destination interpolation Since 'destination' comes from the table in the query, it cannot be cached across queries! Doh!

pgsql: update_tables_*: Added missing `NOT' to `… tid DROP NOT NULL;'.

pgsql: Create column `note' as text.

Add docstring for common.format_domain_default

Document domainnote in manpages 5806fb74130b did not contain this, so I must have forgotten it. Oops.

Remove domain/account notes from TODO

Include account note in getuser output Modify the getuser output to include an account note, if one is present

Display formatted notes in info output If the user/domain object has an attached note, this patch makes the userinfo/domaininfo output print the note, wrapped to the terminal size.

Ignore *.egg-status build directory created by setuptools

Add user/domainnote commands to manpages

Add note field to Account/Domain and CLI

Modify SQL to add note field to domain_data and users

man: vmm.1: subcommand's name argument is optional now. Based on martin f. krafft's v2 of changeset c340ba4bd544.

Allow username to take no argument to erase value Once a username has been set, it could not be removed via the UI. Now, if no argument is passed to username, the value stored is replaced with NULL.

Add inheritance as a feature to README

Change 'force' argument to reset user records for tid/ssid/qid If domain{quotalimit,transport,serviceset} are run with 'force' and settings are inheritable from the domain, then rather than to copy the ID to the user table, the affected field in the user records should be set to NULL so that the domain default is used.

Change UI to accept 'default' to restore inherited values Instead of explicit values for tid/ssid/qid, the UI now accepts 'default', which removed user-pecific settings and hence causes domain defaults to be used.

Modify userinfo output to indicate when domain defaults are displayed When Account instances reference NULL tid/qid/ssid, the data must come from the associated domain, and this should be indicated. For transport and services, this is easy to do as the string passed in the info dict can simply be modified. For quotalimit, however, another method must be used due to the CLI-side formatting. All approaches use a common formatter outsourced to the common.py file.

Modify Account class to handle NULL references This patch modifies the Account class to defer to using the associated domain's tid/ssid/qid fields if the per-instance fields are None/NULL.

Modify SQL update script to accept NULL fields for users The value NULL in the qid/ssid/tid fields of the user table means that the value from the associated domain record should be used instead. This patch modifies the PL/pgSQL functions used by Dovecot and Postfix accordingly.

man: Add examples for userservices

Reverted previous three changesets (e09139525580, 85517c8fde36, 3acbff727626)

Modify userinfo output to indicate when domain defaults are displayed When Account instances reference NULL tid/qid/ssid, the data must come from the associated domain, and this should be indicated. For transport and services, this is easy to do as the string passed in the info dict can simply be modified. For quotalimit, however, another method must be used due to the CLI-side formatting. All approaches use a common formatter outsourced to the common.py file.

Modify Account class to handle NULL references This patch modifies the Account class to defer to using the associated domain's tid/ssid/qid fields if the per-instance fields are None/NULL.

Modify SQL update script to accept NULL fields for users The value NULL in the qid/ssid/tid fields of the user table means that the value from the associated domain record should be used instead. This patch modifies the PL/pgSQL functions used by Dovecot and Postfix accordingly.

Add list* subcommands to TODO

add domain/account notes to TODO

Add my WIP items to the TODO list

Cache interpolated destination Instead of running the string modification function for destination interpolation twice, store the result once and use the stored result subsequently.

man: Use example.com in catchallinfo example output.

README: reStructuredText fix: ERROR/3 and WARNING/2.

Enable interpolation of alias destinations This patch modifies the virtual_alias_maps function so that the destination address is parsed for the place holders %n, %d and %=, which are replaced with the localpart, the domain or the full address with '@' replaced by '=' of the queried key. In combination with alias domains, this allows for domain-specific recipients. E.g. given example.org and its alias domain example.com, defining an alias postmaster@example.org → postmaster+%d@example.org will cause mail to postmaster@example.*com* to go to postmaster+example.*com*@example.org.

Add catch-all aliases to README/features

Add catchall subcommands to manpages

Include catch-all count in domaininfo output

Make PL/pgSQL function feed back identity for mailboxes/relocated when there are catchall destinations. Without catchall aliases, if no virtual_alias matches, the query can just return NULL and Postfix will later check mailboxes/relocated for the address to rewrite. However, since virtual aliases are handled long before mailboxes/relocated, a catchall alias would also catch mail to mailboxes and relocated addresses, which we do not want. The way to tell postfix to keep delivering is for the virtual alias map to return the search key itself (identity function). This patch changes the postfix_virtual_alias_maps Pl/pgSQL function to do exactly that, but only if there are catchall destinations defined for the domain in question — otherwise it returns NULL when no match is found.

Fix syntax errors

Modify virtual_alias_maps function to check mailboxes/relocated first

Make virtual_alias_maps function search catchall when no aliases are found

Add catchall info to domain_info output

Correct syntax errors

Fixup catchall_info to return iterator, not self

Correct syntax errors

Teach CLI about catchall* commands

Provide catchall_* methods to the Handler class

First version of a CatchallAlias class I based the CatchallAlias class in catchall.py heavily on the Alias class, but by copy, not deriving. The two are functionally related, but the implementations are too different because CatchallAliases have no localpart.

Add database table for catchall destinations Catch-all aliases are stored for a domain. Since there can be multiple destinations per domain, this is done using a 1:n relation on the gid. This commit extends the SQL schema definition and also provides appropriate upgrade DDL.

pgsql: Merged types and functions into the create_tables… files.

postfix: Removed VIEW-based comments from configuration files.

pgsql: Removed most of the VIEWs. There are only two views left for now: - postfix_gid - vmm_domain_info All other views have a faster replacement: plpgsql functions.

Ignore even more Debian-build-related files

Ignore more Debian-build-related files Debian produces log and debhelper files in debian/* that do not need to be known to mercurial. Hence, this patch adds the globs to .hgignore.

Add non-root TODO

VMM/config: Fixed a typo: s/DB_MUDULES/DB_MODULES/g.

Ignore build files related to Debian packaging During Debian packaging, the package is built in ./debian/vmm/, and quilt is used (./.pc/). Both directories contain only generated files and should hence be ignored from the perspective of Mercurial.

Instruct mercurial to ignore build directory Python's distutil builds the package into ./build/, which can and should be ignored with respect to the repository. This patch simply adds the appropriate line to .hgignore.

VMM/handler: Create domain directory with umask 0022.

Modify address check query to obtain well-defined result The way in which UNION does not yield the desired result, because (a) UNION merges results and (b) the result order is undefined. This patch changes the query to select the counts as columns and hence provides a well-defined order.

postfix: Uncommented the query in pgsql-smtpd_sender_login_maps.cf.

postfix: Renamed pgsql-transport.cf to pgsql-transport_maps.cf. Now it matches pgsql-${postfix-parameter}.cf.

po: Updated French translation (translated by Dimitri Duc).

po: Updated Finnish translation (translated by Jorma Karvonen).

VMM/cli/subcommands: Fixed a TypeError in user_info().

postfix: Use pgsql functions in query templates where possible.

pgsql: Updated required privileges for function dovecotpassword.

README: Added section `Installation Prerequisites'. Reworked some parts.

update_config: Write the old package install dir to a tmp file. upgrade: Remove old CamelCase files. Removed some unused variables.

VMM: The pyPgSQL compatibility commit.

VMM: The Python 2.4.x compatibility commit.

VMM/relocated: Don't accept something@localhost as destination.

man1: Updated configuration related descriptions/examples, accordingly to commit 4ff0fa3ba0fa.

Updated the author's e-mail address.

man: Updated the URL of the bug tracker.

man5: Updated the `usable password schemes' part.

man1: Copied new formatted/translated command output into the examples.

VMM/cli/subcommands: Small improvement of domaininfo's output. Pointed out that the displayed quota limit is valid per user.

man1: Removed obsolete commands and added new commands.

man/de/man1: Removed translated argument names.

VMM/cli/subcommands: Use the common output formatting in list_pwschemes().

VMM/handler: Added a comment for the Translation Project.

VMM/cli/subcommands: Subcommand argument placeholders are no longer translatable.

po: Updated German translation (translated by Mario Blättermann).

po: Updated address for message-id bug reports. Looks like as sf.net would have horrible configured mail servers. :-/

merged changes from default(c0e1fb1b0145)

po: Added Finnish translation to the repository. Many thanks to Jorma Karvonen from the Translation Project for the work.

VMM/password: list_schemes(): report suffixes with a leading dot.

po: Updated messages template and German translation.

VMM/cli/subcommands: Added new subcommand `listpwschemes' (lp). Marked version()'s ctx argument as unused.

VMM/password: Added function list_schemes().

man5: Moved some option descriptions to section doamin, accordingly to commit 4ff0fa3ba0fa. Added a brief explanation of which settings will be applied in which situations.

update_config: Updated, so that the previous config modifications will be applied to 0.5.2 configurations files.

VMM/config: Moved some options to section `domain': old new ------------------------------------------------------------ account.imap -> domain.imap account.pop3 -> domain.pop3 account.sieve -> domain.sieve account.smtp -> domain.account misc.quota_bytes -> domain.quota_bytes misc.quota_messages -> domain.quota_messages misc.transport -> domain.transport

VMM: Show a warning when a unsupported locale setting was detected.

VMM/cli/subcommands: Small improvement in domain_add(). Inform the admin, when the postmaster account will be auto-created.

VMM/cli/subcommands: Fixed a small failure in alias_info().

TODO: updated …

VMM/domain: Extended Domain._chk_state() to support both states.

VMM/constants: Cleared out obsolete error codes.

VMM/account: Removed unused import.

VMM/{maillocation,quotalimit}: Unified object initialization code. Simply raise a ValueError for wrong values (unknown IDs).

VMM/transport: Reworked Transport initialization. Set the transport id only if we could find a transport with that id. Raise a ValueError instead of a translatable TransportError(VMMError). VMM/errors: Deleted class TransportError, it is no longer needed.

VMM/cli/subcommands: domainservices: Don't fail when neither a service nor the keyword force was provided.

VMM/domain: Extended/updated Domain.get_info() in order to: - include active service(s) || None - use more understandable English terms VMM/cli/subcommands: Updated (order of) keys of `domaininfo' output. .`userinfo' will always show `sieve', no longer `managesieve'.

VMM/cli/subcommands: Small indent fix.

VMM/cli/subcommands: Added subcommand domainservices (ds). Replaced subcommands userdisable and userenable by userservices (us).

VMM/account: Integrated class ServiceSet in class Account. Replaced methods Account.enable() and Account.disable() by Account.update_serviceset(). VMM/handler: Replaced methods Handler.user_disable() and Handler.user_enable() by Handler.user_services()

VMM/serviceset: Added @property ServiceSet.services -> dict.

VMM/account: Sorted imports …

VMM/domain: Integrated class ServiceSet in class Domain. VMM/handler: Extended Handler.domain_add() and added Handler.domain_services(). Removed unused domain.get_gid import.

VMM/serviceset: Use SERVICES inside of ServiceSet - avoid slicing.

VMM/serviceset: Added module constant SERVICES.

VMM: Added new module serviceset - provides class ServiceSet.

pgsql: Added new table `service_set'. Moved columns `smtp', `pop3' `imap' and `sieve' from the `users' table to the new `service_set' table.

update_config: Set database.module to pyPgSQL only when psycopg2 is unavailable.

README: Added contet.

man: Removed reStructuredText files.

man: Reworked/updated German manual pages.

man: Added missing `.RE' macro to sub section userinfo (ui).

po: Fixed 2 fatal msgfmt errors inde.po.

po: Updated German translation.

Messages: Replaced some 'Available' by 'Existing'.

po: Regenerated vmm.pot

VMM/emailaddress: Class DestinationEmailAddress accepts also something@localhost addresses now.

VMM/handler: Handler.alias_delete() also use class DestinationEmailAddress for the destination address, instead of class EmailAddress.

VMM/alias: Alias.del_destination() corrected the value assignment in the error message's dictionary.

VMM/alias: Alias._load_dests() use class DestinationEmailAddress for destination addresses, instead of class EmailAddress.

VMM/cli/subcommands: user_add() show only generated passwords - not the given.

VMM: Deleted a few unused variables.

VMM/network: Added new module network.

VMM/cli/subcommands: Added function update_cmd_map(). So the items will be added to the cmd_map when gettext's _() has been installed -> translatable subcommand descriptions.

po: Regenerated vmm.pot

VMM/cli/subcommands: The keyword 'force' is no longer translatable.

VMM: Updated some messages. (doesn't, isn't) -> (does not, is not) Added missing dots at the end of some sentences.

man: Replaced unnecessary \(aq glyphs in man1/vmm.1. Updated COPYING section in man1/vmm.1 and man5/vmm.cfg.5.

VMM/mailbox: Use the correct mailbox hierarchy separator in Mailbox.add_boxes() for mdbox and sdbox mailbox format.

VMM: Report quota usage/limit/percentage values formatted according to the current LC_ALL setting.

VMM/cli/subcommands: Improved legibility of domaininfo's "quota limit" output a little bit.

man/man5: Reworked/updated vmm.cfg.5. Removed vmm.cfg.5.rst.

man/man1: Small syntax fixes in vmm.1.

man/man1: Reworked/updated vmm.1. Removed vmm.1.rst. reStructuredText was nice to edit but the generated output …

VMM/cli/subcommands: Update also the RunContext's subcommand if 'plan A' in {,alias}domain_info() fails.

VMM/cli/subcommands: Fixed a msgid issue (format string with unnamed arguments).

VMM: Solve the default "misc.quota_bytes = '0'" problem where it may occur.

VMM/cli/subcommands: Made argument names translatable.

man1/vmm.1.rst: Added subcommands domainquota and userquota. Updated description of subcommand aliasadd.

VMM/{account,domain}: Added a versions check to the update_quotalimit methods of classes Account and Domain.

VMM/cli/subcommands: Implemented subcommands domainquota and userquota.

VMM/domain: Execute the database updates of Domain.update_{quotalimit,transport}() when argument force is True, even when the 'new' setting is the same as the current one.

VMM/cli/subcommands: Divided 'quota usage' from userinfo subcommand into 'quota storage' and 'quota messages'.

VMM/quotalimit: Don't fail in QuotaLimit.__init__, if we get the deafult misc.quota_bytes value: '0'.

VMM/common: Reworked human_size() once more. Return bytes w/o prefix. Use translatable $FOO_bibyte prefixes, e.g., MiB.

VMM/cli/subcommands: Added quota limit/usage output to {domain,user}info subcommands.

VMM/cli/subcommands: config_get: Print configured misc.quota_bytes in human readable format.

VMM/common: human_size() size argument can be also a string. Because the default value of misc.quota_bytes is '0', a string in order to accept also settings like '500M'.

VMM/common: human_size accept also 0 as size.

VMM/common: Small code cleanup in human_size().

VMM/common: Added function human_size().

VMM/domain: Adjusted Domain.get_info() to the updated vmm_domain_info view.

pgsql: Updated view vmm_domain_info. No longer select data we have already.

VMM/{account,domain,handler}: Added quota limit support. A few small modifications in class Account.

VMM/account: Removed unused method Account.set_transport().

pgsql: Added quotalimit's bytes and messages to view vmm_domain_info.

pgsql/{create,update}_tables*: Added the ON DELETE CASCADE clause to table userquota{,_11}'s foreign-key constraint fkey_userquota_uid_users.

VMM/mailbox: Added missing dummy translator (_) and comment for method Mailbox._add_boxes.

VMM/quotalimit: Added new module quotalimit to the repository.

VMM/config: Added quota_bytes and quota_messages settings. Updated …/man5/vmm.cfg.5 and vmm.cfg.

VMM/common: Added function size_in_bytes().

pgsql/*: Added tables, triggers and functions for quota support.

VMM:/handler: Fixed typo introduced with the previous commit.

VMM/handler: Handler._make_domain_dir(): Check if the domain directory exists before calling os.mkdir().

VMM/*: Use target column names in all INSERT statements. In order to avoid trouble after the definition of a table was changed.

INSTALL: Updated "user_query".

VMM/mailbox: Be more detailed if doveadm couldn't create mailboxes.

VMM/cli/subcommands: Update also the RunContext's subcommand if 'plan A' in {alias,relocated,user}_info() fails.

VMM/{,cli/}handler: Moved the 'address-in-use check' (introduced with changeset ef99be5b7ec0) to {alias,relocated,user}_add().

VMM/account: Account._count_aliases() cast the EmailAddress to str, in order to avoid errors from the database.

VMM/handler: Handler.relocated_add() check if the target address' domain is known, if so add a warning when the account/alias doesn't exist.

VMM/handler: Handler._get_{account,alias,relocated}() check if the address is already in use.

VMM/handler: Handler.alias_add() and Handler.relocated_add() use DestinationEmailAddress instances for target addresses.

VMM/alias.py: Fixed TypeError when calling dbc.executemany()

setup.py: Fixed syntax error

pgsql/create_tables{,-dovecot-1.2.x}.pgsql: Fixed syntax errors

VMM/emailaddress: Added class DestinationEmailAddress.

Updated copyright notices to include the year 2011.

merged changes from default(cfd29e65e4f2)

INSTALL: Use the %L modifier for %u variable in password_query and user_query.

VMM/domain: set_{directory,transport} make sure the domain is new. Assertions could be optimized away.

VMM/cli/subcommands: Added 'auto postmaster' to domain_add().

VMM/cli/handler: Added support for random passwords in user_add().

VMM/transport: Small error message 'improvement'.

VMM/config: Added option mailbox.format to the configuration check.

update_config: Set pyPgSQL, maybe there is no psycopg2 installed.

man5/vmm.cfg: Added description for new settings in section database.

Updated INSTALL and setup.py.

VMM/handler: Added support for psycopg2.

VMM/cli/main: Adjusted _get_handler() to changes in config module.

VMM/config: Extended configuration check and raise only a ConfigError. Added new settings 'module', 'port', and 'sslmode' to the database section.

VMM/…: Provide parameters as tuple to cursor.execute().

VMM/handler: Small code cleanups.

VMM/common: Reformulated error message in exec_ok.

VMM/cli/config: Except the VMMError from exec_ok in configure().

VMM/config: Use common.VERSION_RE, instead of defining the regexp two times.

VMM/common: Made the version re pattern object accessible as VERSION_RE. Small 'global …' cleanups.

VMM/cli/handler: Don't perform config and environment checks twice.

VMM/cli/subcommands: Added subcommands configget and configset.

VMM/cli/config: CliConfig.set raise a ConfigError, if the new value could not be set.

VMM/cli/main: Except more errors and handle them correct.

VMM/config: LazyConfig._get_section_option check for empty section/option names.

VMM/…: Unified messages and removed non-ASCII quotes. VMM/account: Added TP-comment back. Was accidentally removed in changeset f9a6b6701cf9. Refreshed po/vmm.pot.

vmm: Renamed to VirtualMailManager/cli/main.py. Splitted subcommands out to VirtualMailManager/cli/subcommands.py. vmm: New created with minimal code.

VMM/cli/handler: CliHandler.user_password: Only prompt for the password if the Account exists.

VMM/account: Made Account._services available as account.SERVICES.

VMM/{,cli/}handler: user_add: Check earlier if the account exists.

VMM/domain: Added missing comma in Domain.get_info's SELECT list.

VMM/handler: Updated Handler.user_{disable,enable} methods to accept a list of services. man/{,de/}man1/vmm.1.rst: Updated userenable/userdisable part.

VMM/account: Reworked methods enable/disable in order to accept multiple services.

VMM/{account,handler}: Account delete, use the boolean keyword force too.

man/{,de/}man1/vmm.1.rst: Updated domaindelete part.

VMM/domain: Simplified Domain.delete() related methods and their arguments, VMM/handler: Adjusted to the changes in the domain module.

VMM/handler: _make_home() Create the domain directory if it doesn't exist for some reason.

VMM/account: Replaced property domain_directory by domain.

VMM/common: Removed unused import.

VMM/handler: Use more common.lisdir() in Handler's methods _chkenv, _delete_domain_dir, _delete_home, _get_disk_usage, _make_domain_dir, and _make_home. Handler._make_home(): Also check if the domain directory exists.

VMM/common: Replaced function is_dir() by lisdir(). VMM/{config,mailbox}: Adjusted to the above change.

VMM/handler: Reworked methods _get_disk_usage, _delete_home and _delete_domain_dir. Deleted method _isdir.

VMM/constants: Added MIN_GID and MIN_UID.

VMM/mailbox: Removed accidentally committed debug print statement.

VMM/…: More PEP-8 fixes; eliminated __names. VMM/emailaddress: Fixed™ methods __eq__ and __ne__. (I'm not pylint's nanny.)

VMM/transport: Converted _mixedCase method names to _lower_case_with_underscores. Added missing docstrings. Fixed™ methods __eq__ and __ne__. (I'm not pylint's nanny.)

VMM/*: Made all modules names lowercase, adjusted imports.

VMM//{,cli/}Handler: PEP-8-ified the Handler classes: * converted CamelCase method names to lower_case_with_underscores * eliminated __names * added missing docstrings

VMM//{,cli/}Handler: Reworked configuration related parts. Renamed attributes _Cfg -> _cfg; _cfgFileName -> _cfg_fname. Renamed methods __chkCfgFile -> __check_cfg_file; __findCfgFile -> __find_cfg_file. Added missing docstrings.

VMM/constants: Added __copyright__.

VMM/constants: Replaced the constants subpackage by a module.

VMM/cli: Forgot to remove string_io from __all__.

VMM/cli: Removed misplaced function string_io.

VMM/cli/Config: Write warnings to stderr. Renamed method __saveChanges to __save_changes.

VMM/cli: w_err() call os.sys.exit only if code != 0. read_pass() write errors to stderr. And a few other small fixes.

VMM/ext/Postconf: Reworked class Postconf. Added method edit().

VMM/Handler: Reworked __domDirMake and reamed to __make_domain_dir. Removed the (now) unused method __makedir.

VMM/mailbox: Added to the repository. VMM/Handler: Integrated mailbox module. Code cleanups.

VMM/Transport: Small cosmetics.

VMM/maillocation: Dovecot >= 2.0.beta5 is required for `doveadm mailbox create -s …`

VMM/Account: s/prefix/mbformat/ and pass the dbh to MailLocation.__init__.

VMM/maillocation: Renamed MailLocation's property prefix to mbformat.

VMM/Config: Added boolean option mailbox.subscribe.

VMM/Config: Return mailbox.{folders,root} settings as Unicode.

VMM/maillocation: Reworked class MailLocation to match the new database structure.

VMM/Config: Added function check_mailbox_format().

man/de/man5/vmm.cfg.5.rst: Fixed a typo.

man/{,de/}man5/vmm.cfg.5.rst: Added mailbox.root, small updates.

VMM/Config: Added mailbox.root setting.

pgsql: Added support for different mailbox formats. - users.passwd can store sha512-crypt.hex hashes now - Added new update scripts.

pgsql: Removed old update SQL scripts.

VMM/maillocation: Code cleanups. Fixed error introduced with changeset 084300a00ee1.

VMM/Domain: removed functions ace2idna() and idn2ascii(). domainname.encode('idna')/domainname.decode('idna') works too.

VMM/Account: replaced attribute _mid : int by _mail : MailLocation.

VMM/password: added some CRYPT_* constants. Reverted modification (284:ec1966828246) in _get_salt().

VMM/password: adapted Blowfish/SHA-256/SHA-512 crypt() to recent changes in the Dovecot-2.0 source tree. VMM/Config: Added default number of encryption rounds to the configuration. man5: updated description of misc.crypt_{blowfish,sha{256,512}}_rounds.

VMM/…: re-indented long queries and error messages.

VMM/password: generate all crypt() salts w/o trailing $ sign

man5: added misc.dovecot_version to the minimal config example.

VMM/password: moved the 'scheme check' code from pwhash() to the new function verify_scheme(). VMM/Config: use verify_scheme() to check the scheme when LazyConfig.set() is called.

VMM/Config: removed the default value of misc.dovecot_version. There are too many different versions installed on different systems. So, it doesn't make much sense to have a default value.

VMM/Handler: import the errors before raising them. Rephrased the 'permission error' message.

VMM/password: Added support Blowfish/SHA-256/SHA-512 crypt(). Also updated Config and man section 5.

VMM/Handler: code cleanups in the user/alias/relocated info methods.