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