# HG changeset patch # User Pascal Volk # Date 1391351761 0 # Node ID 2a75058fc064f05e12ecc7a9b3158cec25077992 # Parent 0a06f7b1da6a09987de8ee63ab0cf68861ff8e5d# Parent 5716bf441ceb505bd473086f63a7a49b87061141 Merged changes from default(5716bf441ceb). diff -r 0a06f7b1da6a -r 2a75058fc064 .hgsigs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgsigs Sun Feb 02 14:36:01 2014 +0000 @@ -0,0 +1,1 @@ +93b2f58598660ddcbf9ec1619622399c26aa5d89 0 iQGcBAABAgAGBQJS7VngAAoJEIgLCU7FETn+e+MMAL6FNlvqEgwYz15x9vFa/RM6Gyu2UZhntxkisFRGJ6/zgBa+9z5sLDcdcJlVkrkXPkfENGfC3XqCJkbSiY/1o3dCijjzSMTWoVKMEXb0X57jawt2LQQDMQqnV8EUYyecC5e8inPRGIaiskuMM6thS7AH96FU0x+nZcKRce41hkEyuJ+nDVcbleJzypQ0FjoAKXfsJj1nfMJ+4Poh/BdUjBTUaol/ZV8p9+qtkXzHaAsqrLa3JPXMsgNo6S2vF1QTM6o6rP1Jjka6xjIMXdMeJogxuxn/eleCG/3FgB1sVTGZTS/ad+xSisOE3Dsfk4gQOOTWGsAhMnrnsX9jR5xy25eYnupZWmhrmJ7xZRu0sJmR77ub9rJKAmFzdv1+dEu0zcr5QtxX16XQHZ/cDEtoBWS1/YmHrsaaqTxvoJ3G1WZ9UqI4GBP75wqswz9Mtg9enhfeD6ueMk10Q9aqVrbcQ+JHvNWTb/LiZqEhn9cAr0lvIcGNLnSy1NYKCfi3Q7oR6Q== diff -r 0a06f7b1da6a -r 2a75058fc064 .hgtags --- a/.hgtags Tue Aug 27 21:17:38 2013 +0000 +++ b/.hgtags Sun Feb 02 14:36:01 2014 +0000 @@ -9,3 +9,4 @@ 0000000000000000000000000000000000000000 trunk 3238c58d01ae7f967f0a0a53e7fe53e57a6562ca vmm-0.6.0 682431c45b24ee8b9ed1472dbb4ca491cbdd3d8f vmm-0.6.1 +93b2f58598660ddcbf9ec1619622399c26aa5d89 vmm-0.6.2 diff -r 0a06f7b1da6a -r 2a75058fc064 COPYING --- a/COPYING Tue Aug 27 21:17:38 2013 +0000 +++ b/COPYING Sun Feb 02 14:36:01 2014 +0000 @@ -1,4 +1,4 @@ -Copyright (c) 2007 - 2013, Pascal Volk +Copyright (c) 2007 - 2014, Pascal Volk All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff -r 0a06f7b1da6a -r 2a75058fc064 ChangeLog --- a/ChangeLog Tue Aug 27 21:17:38 2013 +0000 +++ b/ChangeLog Sun Feb 02 14:36:01 2014 +0000 @@ -1,3 +1,174 @@ +=== 0.6.2 === +2014-02-01 Pascal Volk + + * UPGRADE: + UPGRADE: Added a note about upgrading from 0.6.1. + [19184d1265e5] [tip] + + * doc/web/source/conf.py, doc/web/source/download.rst, + doc/web/source/features.rst, + doc/web/source/installation/install_vmm.rst, + doc/web/source/installation/postgresql_configuration.rst, + doc/web/source/pgsql_set_permissionspermissions.rst, + doc/web/source/release_history.rst, + doc/web/source/substitutions.rst, + doc/web/source/upgrade/0.5-0.6.rst: + doc/web: Updated documentation for vmm-0.6.2. + [6c369b680ab0] + + * update_config.py: + update_config: Updated to work with version 0.6.1. + [9149e0249c25] + +2014-01-29 Pascal Volk + + * VirtualMailManager/domain.py: + VMM/domain: RE_DOMAIN: Check Punycode TLDs more precise. + [ad15e89a93ec] + +2014-01-27 Pascal Volk + + * COPYING, VirtualMailManager/__init__.py, + VirtualMailManager/account.py, VirtualMailManager/alias.py, + VirtualMailManager/aliasdomain.py, VirtualMailManager/catchall.py, + VirtualMailManager/cli/__init__.py, + VirtualMailManager/cli/clihelp.py, VirtualMailManager/cli/config.py, + VirtualMailManager/cli/handler.py, VirtualMailManager/cli/main.py, + VirtualMailManager/cli/subcommands.py, VirtualMailManager/common.py, + VirtualMailManager/config.py, VirtualMailManager/constants.py, + VirtualMailManager/domain.py, VirtualMailManager/emailaddress.py, + VirtualMailManager/errors.py, VirtualMailManager/ext/__init__.py, + VirtualMailManager/ext/postconf.py, VirtualMailManager/handler.py, + VirtualMailManager/mailbox.py, VirtualMailManager/maillocation.py, + VirtualMailManager/network.py, VirtualMailManager/password.py, + VirtualMailManager/pycompat/__init__.py, + VirtualMailManager/pycompat/hashlib.py, + VirtualMailManager/quotalimit.py, VirtualMailManager/relocated.py, + VirtualMailManager/serviceset.py, VirtualMailManager/transport.py, + pgsql/set-permissions.py, setup.py, update_config.py, vmm: + Updated copyright notices to include the year 2014. + [58815c004a61] + + * VirtualMailManager/handler.py: + 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. + [01db2457bbed] + +2014-01-26 Pascal Volk + + * README, VirtualMailManager/domain.py: + VMM/domain: Accept also ccTLDs and 'new' gTLDs. + [110491a871a7] + +2013-08-27 Pascal Volk + + * doc/web/source/_templates/layout.html: + doc/web: Removed layout.html template. + [4c8e15c2f01b] + +2013-06-08 Pascal Volk + + * doc/web/source/ext_references.rst, + doc/web/source/howto/manage_domains.rst, + doc/web/source/installation/dovecot_configuration.rst, + doc/web/source/installation/postfix_configuration.rst: + doc/web: Added a note about using Dovecot's LMTP with Postfix. This + solves issue #1. + [61aaa7a98ec0] + +2013-01-05 Pascal Volk + + * COPYING, VirtualMailManager/__init__.py, + VirtualMailManager/account.py, VirtualMailManager/alias.py, + VirtualMailManager/aliasdomain.py, + VirtualMailManager/cli/__init__.py, + VirtualMailManager/cli/clihelp.py, VirtualMailManager/cli/config.py, + VirtualMailManager/cli/handler.py, VirtualMailManager/cli/main.py, + VirtualMailManager/cli/subcommands.py, VirtualMailManager/common.py, + VirtualMailManager/config.py, VirtualMailManager/constants.py, + VirtualMailManager/domain.py, VirtualMailManager/emailaddress.py, + VirtualMailManager/errors.py, VirtualMailManager/ext/__init__.py, + VirtualMailManager/ext/postconf.py, VirtualMailManager/handler.py, + VirtualMailManager/mailbox.py, VirtualMailManager/maillocation.py, + VirtualMailManager/network.py, VirtualMailManager/password.py, + VirtualMailManager/pycompat/__init__.py, + VirtualMailManager/pycompat/hashlib.py, + VirtualMailManager/quotalimit.py, VirtualMailManager/relocated.py, + VirtualMailManager/serviceset.py, VirtualMailManager/transport.py, + setup.py, update_config.py, vmm: + Updated copyright notices to include the year 2013. + [d24f094d1cb5] + +2012-12-09 Pascal Volk + + * VirtualMailManager/account.py: + VMM/account: Fixed a typo in Account.delete(). + + Due to a wrong placed comma `userdelete … force' ended in a + TypeError. + [29295afafa91] + +2012-11-21 Pascal Volk + + * po/fi.po: + po: Updated Finnish translation (translated by Jorma Karvonen). + [86c2ed36aba8] + +2012-11-03 Pascal Volk + + * doc/web/source/installation/prerequisites.rst: + doc/web: Updated OpenBSD's package names. + [54172669bbae] + +2012-10-31 Pascal Volk + + * doc/web/source/installation/postfix_configuration.rst: + doc/web: Fixed a typo. + [6f1aba75b693] + +2012-10-30 Pascal Volk + + * VirtualMailManager/password.py: + VMM/password: Added scheme SCRAM-SHA-1. + [8ea32fbfc9df] + +2012-10-28 Pascal Volk + + * Configure.Dovecot_2, doc/web/source/_static/local.conf, + doc/web/source/installation/dovecot_configuration.rst: + Documentation: Fixed dictionary quota URI. + [152ea3e3e955] + + * install.sh: + install.sh: Don't fail if $SYSCONFDIR doesn't exist. + [9b4d0e2c97d5] + +2012-10-24 Pascal Volk + + * doc/web/source/ext_references.rst: + doc/web/ext_references: Fixed URL of pg_hba.conf. + [c4c687668b6d] + +2012-10-19 Pascal Volk + + * README, doc/web/source/download.rst: + doc/web: Added links to the Debian package and the git repos. + + README: Added git-URL. + [8009e87c7a20] + +2012-10-03 Pascal Volk + + * .hgtags: + Added tag vmm-0.6.1 for changeset 682431c45b24 + [6463832d690e] + + * ChangeLog, NEWS, VirtualMailManager/constants.py, setup.py: + Released vmm-0.6.1 + [682431c45b24] [vmm-0.6.1] + === 0.6.1 === 2012-10-03 Pascal Volk diff -r 0a06f7b1da6a -r 2a75058fc064 NEWS --- a/NEWS Tue Aug 27 21:17:38 2013 +0000 +++ b/NEWS Sun Feb 02 14:36:01 2014 +0000 @@ -1,3 +1,11 @@ +v0.6.2 2014-02-01 Pascal Volk + + * Added support for ccTLDs and 'new' gTLDs + * Added support for SCRAM-SHA-1 password hashes (Dovecot ≧ v2.2.0) + * Updated translations: Finnish + - Fixed a TypeError in `userdelete … force` + - Fixed an error in the install.sh script + v0.6.1 2012-10-03 Pascal Volk * Added help messages for `vmm help ` diff -r 0a06f7b1da6a -r 2a75058fc064 README --- a/README Tue Aug 27 21:17:38 2013 +0000 +++ b/README Sun Feb 02 14:36:01 2014 +0000 @@ -18,7 +18,7 @@ • General features ‣ Unicode/UTF-8 capable (input/storage/output) - ‣ supports IDN_ + ‣ supports IDN_ (also ccTLDs/ccIDNs and 'new' gTLDs) ‣ supports the mailbox format Maildir_ and Dovecot's own high-performance mailbox formats single- and multi-\ dbox_ ‣ configurable basic mailbox structure, including sub-mailboxes diff -r 0a06f7b1da6a -r 2a75058fc064 UPGRADE --- a/UPGRADE Tue Aug 27 21:17:38 2013 +0000 +++ b/UPGRADE Sun Feb 02 14:36:01 2014 +0000 @@ -99,5 +99,10 @@ * execute upgrade.sh + +If you have installed vmm 0.6.1 you simply have to: + + * execute upgrade.sh + else * read INSTALL diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/__init__.py --- a/VirtualMailManager/__init__.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/__init__.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2007 - 2013, Pascal Volk +# Copyright (c) 2007 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/account.py --- a/VirtualMailManager/account.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/account.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2007 - 2013, Pascal Volk +# Copyright (c) 2007 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.account diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/alias.py --- a/VirtualMailManager/alias.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/alias.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2007 - 2013, Pascal Volk +# Copyright (c) 2007 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.alias diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/aliasdomain.py --- a/VirtualMailManager/aliasdomain.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/aliasdomain.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2008 - 2013, Pascal Volk +# Copyright (c) 2008 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.aliasdomain diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/catchall.py --- a/VirtualMailManager/catchall.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/catchall.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2012 martin f. krafft +# Copyright (c) 2012 - 2014, martin f. krafft # See COPYING for distribution information. """ VirtualMailManager.catchall diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/cli/__init__.py --- a/VirtualMailManager/cli/__init__.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/cli/__init__.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2010 - 2013, Pascal Volk +# Copyright (c) 2010 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.cli diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/cli/config.py --- a/VirtualMailManager/cli/config.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/cli/config.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2010 - 2013, Pascal Volk +# Copyright (c) 2010 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.cli.config diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/cli/handler.py --- a/VirtualMailManager/cli/handler.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/cli/handler.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2010 - 2013, Pascal Volk +# Copyright (c) 2010 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.cli.handler diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/cli/main.py --- a/VirtualMailManager/cli/main.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/cli/main.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2007 - 2013, Pascal Volk +# Copyright (c) 2007 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.cli.main diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/cli/subcommands.py --- a/VirtualMailManager/cli/subcommands.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/cli/subcommands.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2007 - 2013, Pascal Volk +# Copyright (c) 2007 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.cli.subcommands diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/common.py --- a/VirtualMailManager/common.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/common.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2010 - 2013, Pascal Volk +# Copyright (c) 2010 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.common diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/config.py --- a/VirtualMailManager/config.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/config.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2007 - 2013, Pascal Volk +# Copyright (c) 2007 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.config diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/constants.py --- a/VirtualMailManager/constants.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/constants.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2007 - 2013, Pascal Volk +# Copyright (c) 2007 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.constants @@ -15,10 +15,10 @@ __all__ = ['__author__', '__date__', '__version__'] AUTHOR = 'Pascal Volk ' -RELDATE = '2012-10-03' -VERSION = '0.6.1' +RELDATE = '2014-02-01' +VERSION = '0.6.2' __author__ = AUTHOR -__copyright__ = 'Copyright (c) 2007-2013 %s' % __author__ +__copyright__ = 'Copyright (c) 2007-2014 %s' % __author__ __date__ = RELDATE __version__ = VERSION diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/domain.py --- a/VirtualMailManager/domain.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/domain.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2007 - 2013, Pascal Volk +# Copyright (c) 2007 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.domain @@ -24,7 +24,9 @@ MAILDIR_CHARS = '0123456789abcdefghijklmnopqrstuvwxyz' -RE_DOMAIN = re.compile(r"^(?:[a-z0-9-]{1,63}\.){1,}[a-z]{2,6}$") +RE_DOMAIN = re.compile(r"""^(?:[a-z0-9-]{1,63}\.){1,} # one or more labels + (?:[a-z]{2,} # a ASCII TLD + |xn--[a-z0-9]{4,})$ # or a ACE TLD""", re.X) _ = lambda msg: msg cfg_dget = lambda option: None diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/emailaddress.py --- a/VirtualMailManager/emailaddress.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/emailaddress.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2008 - 2013, Pascal Volk +# Copyright (c) 2008 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.emailaddress diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/errors.py --- a/VirtualMailManager/errors.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/errors.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2007 - 2013, Pascal Volk +# Copyright (c) 2007 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.errors diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/ext/__init__.py --- a/VirtualMailManager/ext/__init__.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/ext/__init__.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2008 - 2013, Pascal Volk +# Copyright (c) 2008 - 2014, Pascal Volk # See COPYING for distribution information. # package placeholder # diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/ext/postconf.py --- a/VirtualMailManager/ext/postconf.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/ext/postconf.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2008 - 2013, Pascal Volk +# Copyright (c) 2008 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.ext.postconf diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/handler.py --- a/VirtualMailManager/handler.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/handler.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2007 - 2013, Pascal Volk +# Copyright (c) 2007 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.handler @@ -475,7 +475,8 @@ INVALID_ARGUMENT) dom = self._get_domain(domainname) dominfo = dom.get_info() - if dominfo['domain name'].startswith('xn--'): + if dominfo['domain name'].startswith('xn--') or \ + dominfo['domain name'].count('.xn--'): dominfo['domain name'] += ' (%s)' % \ dominfo['domain name'].encode('utf-8').decode('idna') if details is None: diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/mailbox.py --- a/VirtualMailManager/mailbox.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/mailbox.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2010 - 2013, Pascal Volk +# Copyright (c) 2010 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.mailbox diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/maillocation.py --- a/VirtualMailManager/maillocation.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/maillocation.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2008 - 2013, Pascal Volk +# Copyright (c) 2008 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.maillocation diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/network.py --- a/VirtualMailManager/network.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/network.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2011 - 2013, Pascal Volk +# Copyright (c) 2011 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.network diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/password.py --- a/VirtualMailManager/password.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/password.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2010 - 2013, Pascal Volk +# Copyright (c) 2010 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.password diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/quotalimit.py --- a/VirtualMailManager/quotalimit.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/quotalimit.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2011 - 2013, Pascal Volk +# Copyright (c) 2011 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.quotalimit diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/relocated.py --- a/VirtualMailManager/relocated.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/relocated.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2008 - 2013, Pascal Volk +# Copyright (c) 2008 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.relocated diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/serviceset.py --- a/VirtualMailManager/serviceset.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/serviceset.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # coding: utf-8 -# Copyright (c) 2011 - 2013, Pascal Volk +# Copyright (c) 2011 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.serviceset diff -r 0a06f7b1da6a -r 2a75058fc064 VirtualMailManager/transport.py --- a/VirtualMailManager/transport.py Tue Aug 27 21:17:38 2013 +0000 +++ b/VirtualMailManager/transport.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright (c) 2008 - 2013, Pascal Volk +# Copyright (c) 2008 - 2014, Pascal Volk # See COPYING for distribution information. """ VirtualMailManager.transport diff -r 0a06f7b1da6a -r 2a75058fc064 doc/web/source/conf.py --- a/doc/web/source/conf.py Tue Aug 27 21:17:38 2013 +0000 +++ b/doc/web/source/conf.py Sun Feb 02 14:36:01 2014 +0000 @@ -41,7 +41,7 @@ # General information about the project. project = u'vmm' -copyright = u'2007 - 2013, Pascal Volk' +copyright = u'2007 - 2014, Pascal Volk' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff -r 0a06f7b1da6a -r 2a75058fc064 doc/web/source/download.rst --- a/doc/web/source/download.rst Tue Aug 27 21:17:38 2013 +0000 +++ b/doc/web/source/download.rst Sun Feb 02 14:36:01 2014 +0000 @@ -10,31 +10,32 @@ Download a gzip compressed archive ---------------------------------- vmm could be downloaded from the `download page`_ at `SourceForge`_. To -extract the downloaded archive use ``tar xzf vmm-0.6.1.tar.gz``. This will -create the new directory :file:`vmm-0.6.1` in the current working directory. +extract the downloaded archive use ``tar xzf vmm-0.6.2.tar.gz``. This will +create the new directory :file:`vmm-0.6.2` in the current working directory. Verify the downloaded archive ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ If you have downloaded the archive from the download site you can optionally verify the integrity_ of this archive. In order to verify the integrity of the archive you have to download the -corresponding signature file (:file:`vmm-0.6.1.tar.gz.sig`) too. +corresponding signature file (:file:`vmm-0.6.2.tar.gz.sig`) too. The signature can be verified using GPG_ or PGP_. -For example to check the signature of the archive :file:`vmm-0.6.1.tar.gz` -you can execute this command ``gpg --verify vmm-0.6.1.tar.gz.sig``. +For example to check the signature of the archive :file:`vmm-0.6.2.tar.gz` +you can execute this command ``gpg --verify vmm-0.6.2.tar.gz.sig``. -The tarball was signed by Pascal Volk (ID: CEC0904E). +The tarball was signed by Pascal Volk (ID 0xC51139FE). +Older releases (≦ 0.6.1) were signed with key ID 0xCEC0904E). You can fetch the public key from a key server using the command -``gpg --recv-keys 0xCEC0904E``. +``gpg --recv-keys 0xC51139FE``. Get vmm from the Mercurial repository ------------------------------------- To get a tagged clone of the current vmm release from the Mercurial_ repository use: -``hg clone http://hg.localdomain.org/vmm/ -r vmm-0.6.1 vmm-0.6.1``. -This will put the files into the new created directory :file:`vmm-0.6.1`. +``hg clone http://hg.localdomain.org/vmm/ -r vmm-0.6.2 vmm-0.6.2``. +This will put the files into the new created directory :file:`vmm-0.6.2`. -When you omit the ``-r vmm-0.6.1`` option, you will get the latest changes +When you omit the ``-r vmm-0.6.2`` option, you will get the latest changes from the `vmm repository`_. This code may work for you or not. Get vmm from the Git repository diff -r 0a06f7b1da6a -r 2a75058fc064 doc/web/source/features.rst --- a/doc/web/source/features.rst Tue Aug 27 21:17:38 2013 +0000 +++ b/doc/web/source/features.rst Sun Feb 02 14:36:01 2014 +0000 @@ -5,7 +5,7 @@ General features ---------------- ‣ Unicode/UTF-8 capable (input/storage/output) - ‣ supports IDN_ + ‣ supports IDN_ (also ccTLDs/ccIDNs and 'new' gTLDs) ‣ supports the mailbox format Maildir_ and Dovecot's own high-performance mailbox formats single- and multi-\ dbox_ ‣ configurable basic mailbox structure, including sub-mailboxes diff -r 0a06f7b1da6a -r 2a75058fc064 doc/web/source/installation/install_vmm.rst --- a/doc/web/source/installation/install_vmm.rst Tue Aug 27 21:17:38 2013 +0000 +++ b/doc/web/source/installation/install_vmm.rst Sun Feb 02 14:36:01 2014 +0000 @@ -2,19 +2,19 @@ Installing vmm ============== After you've prepared everything, it's time to install vmm. -Change into the :file:`vmm-0.6.1` directory an execute the +Change into the :file:`vmm-0.6.2` directory an execute the :file:`install.sh` script. You can adjust the installation prefix by modifying line 8 of the script. .. code-block:: console - root@host:~# cd /path/to/vmm-0.6.1 - root@host:/path/to/vmm-0.6.1# ./install.sh + root@host:~# cd /path/to/vmm-0.6.2 + root@host:/path/to/vmm-0.6.2# ./install.sh Don't forget to edit /usr/local/etc/vmm.cfg - or run: vmm cf and /etc/postfix/pgsql-*.cf files. - root@host:/path/to/vmm-0.6.1# + root@host:/path/to/vmm-0.6.2# pgsql-\*.cf files ----------------- diff -r 0a06f7b1da6a -r 2a75058fc064 doc/web/source/installation/postgresql_configuration.rst --- a/doc/web/source/installation/postgresql_configuration.rst Tue Aug 27 21:17:38 2013 +0000 +++ b/doc/web/source/installation/postgresql_configuration.rst Sun Feb 02 14:36:01 2014 +0000 @@ -98,14 +98,14 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. code-block:: postgresql-console - mailsys=> \i /path/to/vmm-0.6.1/pgsql/create_tables-dovecot-1.2.x.pgsql + mailsys=> \i /path/to/vmm-0.6.2/pgsql/create_tables-dovecot-1.2.x.pgsql mailsys=> \q Dovecot v1.0.x/v1.1.x ^^^^^^^^^^^^^^^^^^^^^ .. code-block:: postgresql-console - mailsys=> \i /path/to/vmm-0.6.1/pgsql/create_tables.pgsql + mailsys=> \i /path/to/vmm-0.6.2/pgsql/create_tables.pgsql mailsys=> \q Set database permissions diff -r 0a06f7b1da6a -r 2a75058fc064 doc/web/source/pgsql_set_permissionspermissions.rst --- a/doc/web/source/pgsql_set_permissionspermissions.rst Tue Aug 27 21:17:38 2013 +0000 +++ b/doc/web/source/pgsql_set_permissionspermissions.rst Sun Feb 02 14:36:01 2014 +0000 @@ -3,7 +3,7 @@ .. code-block:: console - user@host:~$ python /path/to/vmm-0.6.1/pgsql/set-permissions.py -h + user@host:~$ python /path/to/vmm-0.6.2/pgsql/set-permissions.py -h Usage: set-permissions.py OPTIONS Set permissions for Dovecot and Postfix in the vmm database. @@ -27,7 +27,7 @@ -M USER, --postfix=USER Database user name of the Postfix (MTA) database user. Default: postfix - user@host:~$ python /path/to/vmm-0.6.1/pgsql/set-permissions.py -a -H 127.0.0.1 -U vmm + user@host:~$ python /path/to/vmm-0.6.2/pgsql/set-permissions.py -a -H 127.0.0.1 -U vmm Password: user@host:~$ diff -r 0a06f7b1da6a -r 2a75058fc064 doc/web/source/release_history.rst --- a/doc/web/source/release_history.rst Tue Aug 27 21:17:38 2013 +0000 +++ b/doc/web/source/release_history.rst Sun Feb 02 14:36:01 2014 +0000 @@ -5,6 +5,7 @@ =========== ============ ====================================================== Version Release Date Download URL =========== ============ ====================================================== +vmm-0.6.2 Feb 01 2014 https://sourceforge.net/projects/vmm/files/vmm/0.6.2 vmm-0.6.1 Oct 03 2012 https://sourceforge.net/projects/vmm/files/vmm/0.6.1 vmm-0.6.0 Jun 28 2012 https://sourceforge.net/projects/vmm/files/vmm/0.6.0 vmm-0.5.2 Sep 09 2009 https://sourceforge.net/projects/vmm/files/vmm/0.5.2 diff -r 0a06f7b1da6a -r 2a75058fc064 doc/web/source/substitutions.rst --- a/doc/web/source/substitutions.rst Tue Aug 27 21:17:38 2013 +0000 +++ b/doc/web/source/substitutions.rst Sun Feb 02 14:36:01 2014 +0000 @@ -1,4 +1,4 @@ -.. |curr_vers_rel_date| replace:: The most current version of vmm is 0.6.1, - released on 03 October 2012. +.. |curr_vers_rel_date| replace:: The most current version of vmm is 0.6.2, + released on 01 February 2014. .. |rel_hist| replace:: Older releases are listed in the :doc:`release_history`. diff -r 0a06f7b1da6a -r 2a75058fc064 doc/web/source/upgrade/0.5-0.6.rst --- a/doc/web/source/upgrade/0.5-0.6.rst Tue Aug 27 21:17:38 2013 +0000 +++ b/doc/web/source/upgrade/0.5-0.6.rst Sun Feb 02 14:36:01 2014 +0000 @@ -50,14 +50,14 @@ """""""""""""""""""""""""""" .. code-block:: postgresql-console - mailsys=> \i /path/to/vmm-0.6.1/pgsql/update_tables_0.5.x-0.6-dovecot-1.2.x.pgsql + mailsys=> \i /path/to/vmm-0.6.2/pgsql/update_tables_0.5.x-0.6-dovecot-1.2.x.pgsql mailsys=> \q Dovecot v1.0.x/v1.1.x """"""""""""""""""""" .. code-block:: postgresql-console - mailsys=> \i /path/to/vmm-0.6.1/pgsql/update_tables_0.5.x-0.6.pgsql + mailsys=> \i /path/to/vmm-0.6.2/pgsql/update_tables_0.5.x-0.6.pgsql mailsys=> \q .. _set-database-permissions: @@ -74,7 +74,7 @@ So you have to adjust all your ``postfix/pgsql-*.cf`` files and also your ``/etc/dovecot/dovecot-sql.conf`` or ``/etc/dovecot/dovecot-sql.conf.ext``. - See the `vmm-0.6.1/postfix/pgsql-*.cf` files and + See the `vmm-0.6.2/postfix/pgsql-*.cf` files and :ref:`Dovecot configuration `/`dovecot-sql.conf.ext` or :ref:`Dovecot configuration `/`dovecot-sql-conf`. @@ -94,8 +94,8 @@ .. code-block:: console - root@host:~# cd /path/to/vmm-0.6.1 - root@host:/path/to/vmm-0.6.1# ./upgrade.sh + root@host:~# cd /path/to/vmm-0.6.2 + root@host:/path/to/vmm-0.6.2# ./upgrade.sh Please have a look at your configuration: /usr/local/etc/vmm.cfg This are your Modified/Renamed/New settings: R account.delete_directory = false @@ -178,6 +178,11 @@ ^^^^^^^^^^^ Execute the :file:`upgrade.sh`, in order to install the updated code. +Upgrading from vmm-0.6.1 +------------------------ +If you have already installed vmm-6.0.1, simply execute the +:file:`upgrade.sh` script. + Upgrade to Dovecot ≧ v1.2.beta2 ------------------------------- When you are upgrading your old Dovecot (< v.1.2.beta2) to a newer version, diff -r 0a06f7b1da6a -r 2a75058fc064 pgsql/set-permissions.py --- a/pgsql/set-permissions.py Tue Aug 27 21:17:38 2013 +0000 +++ b/pgsql/set-permissions.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # coding: utf-8 -# Copyright 2012 - 2013, Pascal Volk +# Copyright 2012 - 2014, Pascal Volk # See COPYING for distribution information. """ diff -r 0a06f7b1da6a -r 2a75058fc064 setup.py --- a/setup.py Tue Aug 27 21:17:38 2013 +0000 +++ b/setup.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,12 +1,12 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright 2007 - 2013, Pascal Volk +# Copyright 2007 - 2014, Pascal Volk # See COPYING for distribution information. import os from distutils.core import setup -VERSION = '0.6.1' +VERSION = '0.6.2' descr = 'Tool to manage mail domains/accounts/aliases for Dovecot and Postfix' long_description = """ diff -r 0a06f7b1da6a -r 2a75058fc064 update_config.py --- a/update_config.py Tue Aug 27 21:17:38 2013 +0000 +++ b/update_config.py Sun Feb 02 14:36:01 2014 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: UTF-8 -*- -# Copyright (c) 2008 - 2013, Pascal Volk +# Copyright (c) 2008 - 2014, Pascal Volk # See COPYING for distribution information. import os @@ -54,7 +54,7 @@ def update(cp): if VERSION == '0.5.2': upd_052(cp) - elif VERSION == '0.6.0': + elif VERSION in ('0.6.0', '0.6.1'): os.sys.stdout.write('info: vmm.cfg: nothing to do for version %s\n' % VERSION) return diff -r 0a06f7b1da6a -r 2a75058fc064 vmm --- a/vmm Tue Aug 27 21:17:38 2013 +0000 +++ b/vmm Sun Feb 02 14:36:01 2014 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: UTF-8 -*- -# Copyright 2007 - 2013, Pascal Volk +# Copyright 2007 - 2014, Pascal Volk # See COPYING for distribution information. """This is the vmm main script."""