File pykolab-0.9~dev1-SUSE_template_imapd.patch of Package pykolab

diff -Ppru pykolab-0.8.23.orig/pykolab/setup/setup_imap.py pykolab-0.8.23/pykolab/setup/setup_imap.py
--- pykolab-0.8.23.orig/pykolab/setup/setup_imap.py	2022-02-08 13:36:03.000000000 +0100
+++ pykolab-0.8.23/pykolab/setup/setup_imap.py	2023-01-11 14:19:09.247901527 +0100
@@ -57,6 +57,9 @@ def execute(*args, **kw):
         configdirectory = "/var/lib/cyrus/"
         sievedir = "/var/lib/cyrus/sieve/"
 
+    if os.path.isdir("/var/lib/sieve/"):
+        sievedir = "/var/lib/sieve/"
+
     if os.path.isdir("/var/spool/cyrus/mail/"):
         partition_default = "/var/spool/cyrus/mail/"
 
diff -Ppru pykolab-0.9-dev1.orig/share/templates/imapd.conf.tpl pykolab-0.9-dev1/share/templates/imapd.conf.tpl
--- pykolab-0.9-dev1.orig/share/templates/imapd.conf.tpl	2022-10-16 09:47:09.000000000 +0200
+++ pykolab-0.9-dev1/share/templates/imapd.conf.tpl	2023-01-11 15:21:05.787921517 +0100
@@ -6,9 +6,15 @@ sievedir: $sievedir
 sendmail: /usr/sbin/sendmail
 sasl_pwcheck_method: saslauthd
 sasl_mech_list: PLAIN LOGIN
-allowplaintext: no
-tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
-tls_server_key: $tls_server_key
+allowplaintext: yes
+#cyrus-imapd 2.5:
+#tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
+#tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd.pem
+tls_cert_file: /etc/ssl/servercerts/servercert.pem
+tls_key_file: /etc/ssl/servercerts/serverkey.pem
+tls_ca_file: /etc/ssl/cacert.pem
+sieve_tls_cert_file: disabled
+sieve_tls_key_file: disabled
 # uncomment this if you're operating in a DSCP environment (RFC-4594)
 # qosmarking: af13
 auth_mech: pts
@@ -33,7 +39,9 @@ ldap_time_limit: 10
 unixhierarchysep: 1
 virtdomains: userid
 annotation_definitions: /etc/imapd.annotations.conf
-sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy date index
+#cyrus-imapd 2.5:
+#sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy date index
+sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy
 allowallsubscribe: 0
 allowusermoves: 1
 altnamespace: 1
openSUSE Build Service is sponsored by