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.