[SVN] r518 - in /trunk/cyrus-imapd-2.2.13/debian: changelog imapd.conf

[debian at incase.de]

Author: sven
Date: Thu Jul 27 20:44:44 2006
New Revision: 518

URL: https://mail.incase.de/viewcvs?rev=518&root=cyrus22&view=rev
Log:
Use global ssl cert name, leave service specific names as-is

Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/imapd.conf

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=518&root=cyrus22&r1=517&r2=518&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Thu Jul 27 20:44:44 2006
@@ -9,8 +9,10 @@
   * Improve imapd.conf documentation to show how service specific options can
     be given. Also update packaged imapd.conf to reflect 2.2 syntax and
     behaviour. (Closes: #379881)
-
- -- Sven Mueller <sven at debian.org>  Wed, 26 Jul 2006 18:01:13 +0200
+  * Use ssl-cert and reference system-wide ssl certificates in imapd.conf,
+    leaving the service specific ssl certs as-is.
+
+ -- Sven Mueller <sven at debian.org>  Wed, 26 Jul 2006 19:39:42 +0200
 
 cyrus-imapd-2.2 (2.2.13-4) unstable; urgency=low
 

Modified: trunk/cyrus-imapd-2.2.13/debian/imapd.conf
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/imapd.conf?rev=518&root=cyrus22&r1=517&r2=518&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/imapd.conf (original)
+++ trunk/cyrus-imapd-2.2.13/debian/imapd.conf Thu Jul 27 20:44:44 2006
@@ -201,10 +201,10 @@
 
 # File containing the global certificate used for ALL services (imap, pop3,
 # lmtp, sieve)
-#tls_cert_file: /etc/ssl/certs/cyrus-global.pem
+#tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
 
 # File containing the private key belonging to the global server certificate.
-#tls_key_file: /etc/ssl/private/cyrus-global.key
+#tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key
 
 # File containing the certificate used for imap. If not specified, the global
 # certificate is used.  A value of "disabled" will disable SSL/TLS for imap.