File cyrus-imapd.conf-cert-paths.patch of Package pykolab-python3 (Revision c54df07153776be76b4c4112a452e569)

Currently displaying revision c54df07153776be76b4c4112a452e569 , Show latest

40
 
1
diff -ur pykolab-0.8.6.orig/share/templates/guam.sys.config.tpl pykolab-0.8.6/share/templates/guam.sys.config.tpl
2
--- pykolab-0.8.6.orig/share/templates/guam.sys.config.tpl  2016-11-18 12:24:34.000000000 +0100
3
+++ pykolab-0.8.6/share/templates/guam.sys.config.tpl   2016-11-18 13:35:14.350503922 +0100
4
@@ -26,9 +26,7 @@
5
                             },
6
                             {
7
                                 tls_config, [
8
-                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" },
9
-                                    { cacertfile, "/etc/pki/cyrus-imapd/cyrus-imapd-ca.pem" },
10
-                                    { keyfile, "/etc/pki/cyrus-imapd/cyrus-imapd-key.pem" }
11
+                                    { certfile, "/etc/ssl/private/cyrus-imapd.pem" }
12
                                 ]
13
                             }
14
                         ]
15
@@ -43,9 +43,7 @@
16
                             },
17
                             {
18
                                 tls_config, [
19
-                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" },
20
-                                    { cacertfile, "/etc/pki/cyrus-imapd/cyrus-imapd-ca.pem" },
21
-                                    { keyfile, "/etc/pki/cyrus-imapd/cyrus-imapd-key.pem" }
22
+                                    { certfile, "/etc/ssl/private/cyrus-imapd.pem" }
23
                                 ]
24
                             }
25
                         ]
26
diff -ur pykolab-0.8.6.orig/share/templates/imapd.conf.tpl pykolab-0.8.6/share/templates/imapd.conf.tpl
27
--- pykolab-0.8.6.orig/share/templates/imapd.conf.tpl   2016-11-18 12:24:34.000000000 +0100
28
+++ pykolab-0.8.6/share/templates/imapd.conf.tpl    2016-11-18 13:34:48.872221218 +0100
29
@@ -7,8 +7,8 @@
30
 sasl_pwcheck_method: saslauthd
31
 sasl_mech_list: PLAIN LOGIN
32
 allowplaintext: no
33
-tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
34
-tls_server_key: $tls_server_key
35
+tls_server_cert: /etc/ssl/private/cyrus-imapd.pem
36
+tls_server_key: /etc/ssl/private/cyrus-imapd.pem
37
 # uncomment this if you're operating in a DSCP environment (RFC-4594)
38
 # qosmarking: af13
39
 auth_mech: pts
40