[SVN] r517 - in /trunk/cyrus-imapd-2.2.13/debian: changelog imapd.conf patches/00list patches/75-update-imapd.conf-documentation.dpatch

debian at incase.de debian at incase.de
Wed Jul 26 17:36:42 UTC 2006 

Author: sven
Date: Wed Jul 26 19:36:25 2006
New Revision: 517

URL: https://mail.incase.de/viewcvs?rev=517&root=cyrus22&view=rev
Log:
Update documentation and packages imapd.conf to reflect some changes from 2.1 to 2.2 (Closes : #379881)

Added:
    trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch   (with props)
Modified:
    trunk/cyrus-imapd-2.2.13/debian/changelog
    trunk/cyrus-imapd-2.2.13/debian/imapd.conf
    trunk/cyrus-imapd-2.2.13/debian/patches/00list

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=517&root=cyrus22&r1=516&r2=517&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Wed Jul 26 19:36:25 2006
@@ -6,8 +6,11 @@
     postinst script. (Closes: #378518)
   * Modify debian/rules to once again create a meaningful
     cyrus-db-types.txt file (Closes: #366957)
-
- -- Sven Mueller <sven at debian.org>  Wed, 19 Jul 2006 23:01:58 +0200
+  * 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
 
 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=517&root=cyrus22&r1=516&r2=517&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/imapd.conf (original)
+++ trunk/cyrus-imapd-2.2.13/debian/imapd.conf Wed Jul 26 19:36:25 2006
@@ -53,8 +53,8 @@
 #admins: cyrus
 
 # Space-separated list of users that have lmtp "admin" status (i.e. that
-# can deliver email through TCP/IP lmtp) in addition to those in the
-# admins: entry above
+# can deliver email through TCP/IP lmtp). If specified, this parameter
+# overrides the "admins" parameter above
 #lmtp_admins: postman
 
 # Space-separated list of users that have mupdate "admin" status, in
@@ -208,39 +208,39 @@
 
 # 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.
-#tls_imap_cert_file: /etc/ssl/certs/cyrus-imap.pem
+#imap_tls_cert_file: /etc/ssl/certs/cyrus-imap.pem
 
 # File containing the private key belonging to the imap-specific server
 # certificate.  If not specified, the global private key is used.  A value of
 # "disabled" will disable SSL/TLS for imap.
-#tls_imap_key_file: /etc/ssl/private/cyrus-imap.key
+#imap_tls_key_file: /etc/ssl/private/cyrus-imap.key
 
 # File containing the certificate used for pop3. If not specified, the global
 # certificate is used.  A value of "disabled" will disable SSL/TLS for pop3.
-#tls_pop3_cert_file: /etc/ssl/certs/cyrus-pop3.pem
+#pop3_tls_cert_file: /etc/ssl/certs/cyrus-pop3.pem
 
 # File containing the private key belonging to the pop3-specific server
 # certificate.  If not specified, the global private key is used.  A value of
 # "disabled" will disable SSL/TLS for pop3.
-#tls_pop3_key_file: /etc/ssl/private/cyrus-pop3.key
+#pop3_tls_key_file: /etc/ssl/private/cyrus-pop3.key
 
 # File containing the certificate used for lmtp. If not specified, the global
 # certificate is used.  A value of "disabled" will disable SSL/TLS for lmtp.
-#tls_lmtp_cert_file: /etc/ssl/certs/cyrus-lmtp.pem
+#lmtp_tls_cert_file: /etc/ssl/certs/cyrus-lmtp.pem
 
 # File containing the private key belonging to the lmtp-specific server
 # certificate.  If not specified, the global private key is used.  A value of
 # "disabled" will disable SSL/TLS for lmtp.
-#tls_lmtp_key_file: /etc/ssl/private/cyrus-lmtp.key
+#lmtp_tls_key_file: /etc/ssl/private/cyrus-lmtp.key
 
 # File containing the certificate used for sieve. If not specified, the global
 # certificate is used.  A value of "disabled" will disable SSL/TLS for sieve.
-#tls_sieve_cert_file: /etc/ssl/certs/cyrus-sieve.pem
+#sieve_tls_cert_file: /etc/ssl/certs/cyrus-sieve.pem
 
 # File containing the private key belonging to the sieve-specific server
 # certificate.  If not specified, the global private key is used.  A value of
 # "disabled" will disable SSL/TLS for sieve.
-#tls_sieve_key_file: /etc/ssl/private/cyrus-sieve.key
+#sieve_tls_key_file: /etc/ssl/private/cyrus-sieve.key
 
 # File containing one or more Certificate Authority (CA) certificates.
 #tls_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem
@@ -264,16 +264,16 @@
 #tls_require_cert: false
 
 # Require a client certificate for imap ONLY.
-#tls_imap_require_cert: false
+#imap_tls_require_cert: false
 
 # Require a client certificate for pop3 ONLY.
-#tls_pop3_require_cert: false
+#pop3_tls_require_cert: false
 
 # Require a client certificate for lmtp ONLY.
-#tls_lmtp_require_cert: false
+#lmtp_tls_require_cert: false
 
 # Require a client certificate for sieve ONLY.
-#tls_sieve_require_cert: false
+#sieve_tls_require_cert: false
 
 #
 # Cyrus Murder cluster configuration

Modified: trunk/cyrus-imapd-2.2.13/debian/patches/00list
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/00list?rev=517&root=cyrus22&r1=516&r2=517&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/00list (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/00list Wed Jul 26 19:36:25 2006
@@ -45,4 +45,5 @@
 65-sieveshell-enhancements.dpatch
 70-allow-larger-buffers.dpatch
 72-faster-isdigit.dpatch
+75-update-imapd.conf-documentation.dpatch
 99-update-autoconf.dpatch

Added: trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch?rev=517&root=cyrus22&view=auto
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch (added)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch Wed Jul 26 19:36:25 2006
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fileV0WscV.dpatch by Sven Mueller <sven at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.sBopzk/cyrus-imapd-2.2.13/lib/imapoptions
+--- cyrus-imapd-2.2.13/lib/imapoptions	2006-07-26 16:34:40.000000000 +0200
++++ /tmp/dpep.sBopzk/cyrus-imapd-2.2.13/lib/imapoptions	2006-07-26 17:08:18.006267524 +0200
+@@ -69,7 +69,10 @@
+ \fB/etc/imapd.conf\fR file, and show each option's default value.
+ Some options have no default value, these are listed with
+ ``<no default>''.  Some options default to the empty string, these
+-are listed with ``<none>''.
++are listed with ``<none>''. It is also possible to override options by
++specifying them as <service_id>_<optionname>. One example is ``lmtp_admins'',
++which overrides ``admins'' just for the lmtp service. The <service_id> is the
++one you specified in the \fB/etc/cyrus.conf\fR file.
+ */
+ 
+ # OPTIONS

Propchange: trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch
------------------------------------------------------------------------------
    svn:executable = *

More information about the Pkg-Cyrus-imapd-Debian-devel mailing list