2 commits - pykolab/cli share/templates

[Jeroen van Meeuwen]

 pykolab/cli/cmd_rename_mailbox.py |    2 +-
 share/templates/imapd.conf.tpl    |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 744579ee5923eb3ba75439e96c8393e4ac9592a9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Oct 30 14:47:38 2014 +0100

    Update imapd.conf.tpl template to reflect changes in Cyrus IMAP

diff --git a/share/templates/imapd.conf.tpl b/share/templates/imapd.conf.tpl
index a43aad9..194135e 100644
--- a/share/templates/imapd.conf.tpl
+++ b/share/templates/imapd.conf.tpl
@@ -6,9 +6,8 @@ sendmail: /usr/sbin/sendmail
 sasl_pwcheck_method: auxprop saslauthd
 sasl_mech_list: PLAIN LOGIN
 allowplaintext: no
-tls_cert_file: /etc/pki/cyrus-imapd/cyrus-imapd.pem
-tls_key_file: /etc/pki/cyrus-imapd/cyrus-imapd.pem
-tls_ca_file: /etc/pki/cyrus-imapd/cyrus-imapd.pem
+tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
+tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd.pem
 # uncomment this if you're operating in a DSCP environment (RFC-4594)
 # qosmarking: af13
 auth_mech: pts
@@ -47,5 +46,4 @@ username_tolower: 1
 deletedprefix: DELETED
 delete_mode: delayed
 expunge_mode: delayed
-flushseenstate: 1
 postuser: shared


commit 76dae9592d018209eb76802592e7987560fc10ad
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Oct 30 14:46:53 2014 +0100

    Fix command rename-mailbox, which was restricting itself to user/* mailboxes only

diff --git a/pykolab/cli/cmd_rename_mailbox.py b/pykolab/cli/cmd_rename_mailbox.py
index 4efed0d..80098e2 100644
--- a/pykolab/cli/cmd_rename_mailbox.py
+++ b/pykolab/cli/cmd_rename_mailbox.py
@@ -70,5 +70,5 @@ def execute(*args, **kw):
         print >> sys.stderr, _("Target folder %r already exists") % (target_folder)
         sys.exit(1)
 
-    imap.user_mailbox_rename(source_folder.replace('user/',''), target_folder.replace('user/',''), partition=partition)
+    imap.imap.rename(source_folder, target_folder, partition)