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.

VMM/Handler: fixed destination check in Handler.aliasAdd().

VMM/Alias: moved the postconf stuff from the Handlers to Alias class.

VMM/{Config,Handler}: moved Config.install() to Handler.cfg_install(). Handler.cfg_install() must be called explicitly. To avoid 'strange' problems.

VMM/cli/Handler: fixed AttributeError in CliHandler.__init__(). Attribute '_scheme' was removed in previous commit.

VMM/Handler: removed password hashing related stuff.

VMM{,/cli}/Handler: adjusted user* methods to the changes in Account. All user methods was renamed from userAction() to user_action(). Added missing docstrings.

VMM/Account: always pass the EmailAddress to the pwhash() call.

VMM/Account: some modifications and small improvements in class Account. - replaced the tid by a Transport instance - check mailbox format dependencies in _repare() - reset all attributes when the Account was deleted - don't select information, we have already, from the db - added __nonzero__() method

VMM/password: added small output check on _dovecotpw().

VMM/common: added a caching dict for version_hex()/version_str()

VMM/Config: Added method Config.install() -> global cfg_dget(). VirtualMailManager.Configuration removed -> some adjustments.

INSTALL: dropped group mail related stuff. UPGRADE: be more details about nobody's primary group.

configuration: Dropped setting misc.gid_mail. That setting was never useful, since none of the virtual users was a member of a system group.

man/{,de/}man5/vmm.cfg.5.rst: Updated descriptions of dovecotpw and password_scheme settings.

VMM: added new modules password and pycompat.hashlib. INSTALL: updated

VMM/maillocation: Use the hex version, since we are able to convert it to an string, in case of a failure.

VMM/{Account,common,Handler}: Improved version_hex(). - common: version_hex() now supports 'serials' > 16. Added version_str() as counterpart to version_hex(). - Account, Handler: updated hardcoded Dovecot versions.

VMM/{Account,common,maillocation}: Dovecot version (check) fixes. - Account: fixed versions dependencies. - maillocation: use the version string, may be uses in a error message. - common: version_hex() raises a ValueError, instead of returning 0, if the version string is invalid.

Use the complete Dovecot version, not only the concatenated major and minor parts. (1.2.11 instead of 12).

VMM/common: improved version_hex() in order to convert also alpha, beta and release candidate versions.

VMM: moved some non-init functions to the new common module. Adjusted imports in the Config and Handler module.

setup.py: Added sub-package pycompat to the packages list.

VMM/pycompat: is now a sub-package.

merged changes from default(9bf8d97ced88)

VMM/VMM: corrected name of password scheme PLAIN-MD4.

VMM/Alias.py: Replaced some %r with '%s'. VMM/AliasDomain.py: save(), switch(), delete(): Update AliasDomain._gid after database change. Added dbc.close() to AliasDomain.delete(). create_tables{,-dovecot-1.2.x}.pgsql: Fixed a typo.

VMM: added 'Configuration' variable and set_configuration(). Handler.__init__() now exports its config via set_configuration().

VMM/Handler: renamed some methods and added their missing docstrings: - cfgDget() -> cfg_dget() - cfgPget() -> cfg_pget() - userByID() -> user_by_uid()

VMM: moved functions ace2idna(), check_domainname(), idn2ascii() and relevant parts to the Domain module. Adjusted imports in modules AliasDomain, EmailAddress and Handler.

VMM: moved check_localpart() to the EmailAddress module.

VMM/Account: renamed function getAccountByID -> get_account_by_uid. Fixed AttributeError (tid) in Account._prepare(). Removed unused imports.

VMM/Handler: Implemented Handler._chk_other_address_types(). Removed the static methods accountExists(), aliasExists(), relocatedExists() and _exists().

VMM/{Account,Alias,Relocated}: added a address property to the classes Account, Alias and Relocated.

VMM/Relocated: implemented Relocated.__nonzero__() for truth value testing. Use EmailAddress' __str__() method when raising RelocatedErrors.

merged changes from default(dbcb29ac89fa)

INSTALL: simplified the 'SETUID copy of deliver' part

VMM/Account: Account.get_info() use the domain's transport, if tid matches.

VMM/Account: reworked class Account.

VMM/Handler: adjusted Handler.aliasDomain*() methods to changes in the AliasDomain class. Updated docstrings.

VMM/AliasDomain: some cleanups in class AliasDomain. Added missing docstrings.

VMM/Domain: search() small code cleanups.

VMM/Handler: small code cleanups and an improved import statement.

merged changes from default(184970fd7486)

VMM/Domain: search() lists now all matching domains, also when the result contains primary and alias names, but the found alias is not an alias for any of the found primaries.

VMM/VMM: applied 'code compression' from v0.6.x(09b7e3fe29b3) to VirtualMailManager.domainList().

VMM/Handler: compressed Handler.domainList() and replaced “%s” with '%s' in error message.

VMM/Domain: reworked Domain class. Adjusted classes Account, AliasDomain and Handler to changes in the Domain class.

VMM/Transport: Renamed attribute/property {,_}id to {,_}tid.

VMM: check_localpart() use '%s' instead of %r in error messages.

merged changes from default(8c4df3dd2d2c)

vmm: minimal cleanups.

VMM: VirtualMailManager.__pwhash() added support for 'doveadm pw'. dovecotpw was replaced by `doveadm pw` in Dovecot v2.0. To use doveadm instead of dovecotpw use the following settings in vmm.cfg: [bin] dovecotpw = /path/to/doveadm [misc] dovecotvers = 20

man: updated configuration manual pages (maildir.* -> mailbox.*).

vmm.cfg: renamed maildir.folders to mailbox.folders. maildir.name was removed. new: mailbox.format, in order to support all mailbox formats from Dovecot. Maildir is the default format. Adjusted VirtualMailManager/Config and update_config.py to the changes mentioned above.

VMM/maillocation: MailLocation.__init__(): take a 'format' name, instead of a 'directory' name. - added function known_format() to the module. VMM/Account: Adjusted to above changes.

VMM/Account: Adjusted to changes in maillocation.MailLocation. VMM/maillocation: Class MailLocation added missing property `mid`. Added new error to VMM/constants/ERROR and doc/source/vmm_constants_error

VMM/maillocation: rewrote MailLocation class. Renamed MailLocation.py to maillocation.py.

VMM/Transport: reworked Transport class. Use assertions for argument checks. Removed methods getID() and getTransport(). This values are now accessible through the read-only attributes id and transport. VMM/{Account,Domain}: adjusted to modifications in Transport class. A few code cleanups.

VMM/pycompat: added function any() for Python 2.4

replaced some "for x in list …"

VMM/Domain: get_gid() return 0 instead of raising an Exception, if the domain wasn't found in the database.

VMM/Alias: renamed Alias.add_destination() to add_destinations(). Now it's possible to add one ore more destinations to the alias with a single method call. VMM/Handler: adjusted Handler.aliasAdd() to the API changes of the Alias class. Also use get_gid from the Domain module to get the gid of a domain. We don't need complete Domain object, only the gid. Handler.getWarnings(): no longer return the __warnings list. Return a copy instead and empty the Handler.__warnings list.

doc: Added the alias documentation.

VMM/pycompat: added to the repository. Provides all() for Py24.

VMM/EmailAddress: implemented EmailAddress.__hash__(). So we can have a set() of EmailAddress instances.

VMM/cli: small optimizations in the functions w_std() and w_err()

Moved VirtualMailManager/Exceptions to VirtualMailManager/errors. Renamed VMM*Exception classes to *Error. No longer add the attribute 'message' to VMMError if it doesn't exist, like in Python 2.4. It has been deprecated as of Python 2.6. Also removed the methods code() and msg(), the values are now accessible via the attributes 'code' and 'msg'.

PEP-8-ified the work of the last days. Renamed methods in class Alias: addDestination() -> add_destination() delDestination() -> del_destination() getDestinations() -> get_destinations() Renamed methods in class Relocated: setDestination() -> set_destination() getInfo() -> get_info() Renamed VMM/constants/VERSION.py -> VMM/constants/version.py Adjusted relevant parts of the documentation.

VMM/Exceptions: use the inherited CTor in all VMM*Exception classes.

VMM:/{Alias,EmailAddress,Relocated}: use assertions for argument checks.

doc: extended documentation.

VMM/Config: LazyConfig.getboolean(), convert the value in our getboolean. So RawConfigParser hasn't to do the whole get() stuff again.

Added 'doc/build' to the ignored files.

VMM{/Config}: reduced docstrings. Added doc to the repository.

VMM: removed unneeded/duplicated regular expression definitions

VMM/Config: moved Config.sections() to class LazyConfig. No longer import the ENCODING from VirtualMailManager, it's no longer required in the Config module.

VMM/Config: renamed LazyConfig's get_boolean() to getboolean(). VMM/cli/Config: import required ConfigParser.RawConfigParser.

VMM/cli: added __init__.py to the repository.

VMM/{,cli/}Config: fixed imports. Small code cleanups and cosmetic.

VMM/Alias: small code cleanups and cosmetic.

VMM/Relocated: small code cleanups and cosmetic.

VMM/Config: LazyConfigOption.__init__() cast 'default' to 'cls'. If the default value is not None, make sure it has the proper type.

VMM/Config: attributes of class LazyConfigOption are read-only now. Some small code cleanups.

VMM: renamed function chk_domainname() -> check_domainname(). Moved EmailAddress.check_localpart() -> VirtualMailManager.check_localpart(). Some small code cleanups in class EmailAddress.

VMM/Domain: added function get_gid() to the Domain module. We don't need to load all the domain related information from the database, when we need only the GID of a domain. For example in the Alias or Relocated classes.

VMM/{Relocated,Handler}: reworked Relocated class, adjusted Handler.

VMM/{Alias,Handler}: reworked Alias class, adjusted Handler class. Handler: - attribute _dbh is no longer private, the VMM/cli/Handler uses it also. - adjusted to changes in Alias and EmailAddress classes.

VMM/EmailAddress: reworked class EmailAddress again. The attributes domainname and localpart are now read-only.

VMM/EmailAddress: reworked once more. - moved EmailAddress.__chkLocalpart() -> __module__.check_localpart() - renamed EmailAddress.__chkAddress() -> EmailAddress._chk_address() - attributes domainname and localpart are no longer protected - added missing doc strings.

VMM/EmailAddress: rework EmailAddress class.

VMM/Handler: fixed a SyntaxError. Oops

VMM/Handler: __mailDirMake() add warning for skipped mailboxes. - domainInfo() removed old deprecated warning. - fixed PEP8 warnings.

VMM/{,cli/}Handler: reverted most of cs cf1b5f22dbd2 added a cli handler. Moved the interactive stuff from VMM/Handler to the derived VMM/cli/Handler.

moved VMM/cli/CliConfig to VMM/cli/Config

VMM/Handler: __init__ accepts now a config_type ('default'||'cli'). - fixed syntax errors, introduced with the last commit. VMM/Config: added Config.configure() -> NotImplementedError. VMM/__init__: install gettext global, everything depends on it.

VMM/{,cli/Cli}Config: Moved interactive stuff to new CliConfig class. Renamed Config.getsections() to Config.sections(). Small cosmetics.

moved VMM/cli/handler to VMM/Handler

VMM/*: Moved some methods from classes to modules __init__. - Adjusted many import statements. - Small adjustments and whitespace cosmetics in Config.py

moved VMM/VMM to VMM/cli/handler

vmm: reworked subcommand/arguments mapping.

VMM/VMM: Allow version/help subcommands even with missing configuration options.

update_config: do not add options w/ default values. remove config.done

VMM/Config: dropped option config.done

man: updated documentation …

po: Quick refresh - for documentation purpose.

man/{,de/}man5: added a note about how to use default settings. man/de/man5: s/Abschnitt*/Sektion*/g

man: Added used default values to manual.

VMM/VMM: allow configure subcommand also with missing settings. Removed method VirtualMailManager.setupIsDone() VMM/Config: Config.load() added 'finally' clause.

VMM/Config: reworked configuration handling. Implemented LazyConfig(RawConfigParser) and LazyConfigOption(object) Rewrote Config class: * use default values and added some validation stuff * removed attributes: __VMMsections and __changes * replaced methods __chkSections() and __chkOptions() with __chkCfg VMM/VMM: Adjusted to reworked Config class. * removed attribute __cfgSections * removed methods: cfgGetBoolean(), cfgGetInt(), cfgGetString() * added methods: cfgDget(), cfgPget(), cfgSet() VMM/__init__: added function get_unicode() vmm: Adjusted to replaced methods in VMM/VMM.

branch merge

VMM/Config: Fixed error handling of missing sections in vmm.cfg.

VMM/Config: Fixed error handling of missing sections in vmm.cfg.

man: reworded some parts.

man: updated man/{de/,}man5/vmm.cfg.5, using reStructuredText now

vmm.cfg: a few re-renamed configuration options. old new -------------------------------------------------- account.password_len -> account.password_length domain.force_del -> domain.force_deletion misc.base_dir -> misc.base_directory misc.dovecot_vers -> misc.dovecot_version

update_config.py: adjusted functions stuff to renamed settings. Finally renamed update_config_0.4.x-0.5.py to update_config.py - no more version information in the filename. *.sh: removed .svn directory exclusion from find command.

vmm.cfg: dealt with the most overdue section/option renaming. Added new options. Details: old new ------------------------------------------------------------ domdir.mode -> domain.directory_mode domdir.delete -> domain.delete_directory domdir.base -> misc.base_dir domdir -> _section domdir deleted_ maildir.mode -> account.directory_mode maildir.diskusage -> account.disk_usage maildir.delete -> account.delete_directory misc.forcedel -> domain.force_del misc.passwdscheme -> misc.password_scheme misc.dovecotvers -> misc.dovecot_vers services.smtp -> account.smtp services.pop3 -> account.pop3 services.imap -> account.imap services.sieve -> account.sieve services -> _section services deleted_ _NEW_.random_password -> account.random_password _NEW_.password_len -> account.password_len _NEW_.auto_postmaster -> domain.auto_postmaster

INSTALL: Adapted pgsql configuration steps to that in the wiki. (Closes: #2922030)

*.sh: Added --force option to python setup.py install call. upgrade.sh: Removed old cleanup code.

setup.py: Fixed a UserWarning that may occur with older Python.

Updated copyright notices to include the year 2010. Also corrected the name of the copyright holder and updated the e-mail address.

Removed the svn-ish tag trunk

*.pgsql: moved to pgsql/

Moved Postfix PostgreSQL client configuration files into the postfix directory.

VMM: Don't prompt endless for a password. Stop after 3rd failure.

vmm: plan_a_b s/address/object/

Added comments for the Translation Project. Updated PO template.

Fixed some grammar errors and typos. (Reported by Clytie Siddall)

Added the Vietnamese translation to the repository. Many thanks to Clytie Siddall from the Translation Project for the work.