[pkg-kolab] r354 - trunk/kolab-cyrus-imapd/debian

[Noel Koethe]

Author: noel
Date: 2006-03-04 22:58:31 +0000 (Sat, 04 Mar 2006)
New Revision: 354

Modified:
   trunk/kolab-cyrus-imapd/debian/changelog
   trunk/kolab-cyrus-imapd/debian/cyrus.conf
   trunk/kolab-cyrus-imapd/debian/imapd.conf
Log:
ldap options, enable pop

Modified: trunk/kolab-cyrus-imapd/debian/changelog
===================================================================
--- trunk/kolab-cyrus-imapd/debian/changelog	2006-03-04 22:48:33 UTC (rev 353)
+++ trunk/kolab-cyrus-imapd/debian/changelog	2006-03-04 22:58:31 UTC (rev 354)
@@ -3,8 +3,13 @@
   * enabled --with-auth=pts and --with-pts=ldap
   * install the new ptdump, ptexpire and ptloader binaries into
     kolab-cyrus-imapd
+  * add fixing patches from Tobias König <tobias.koenig at credativ.de>
+    151-cyrus_kolab_ldap.patch
+    152-cyrus_auth_pts.patch
+  * add LDAP configure options to imapd.conf
+  * enable pop in default cyrus.conf
 
- -- Noèl Köthe <noel at debian.org>  Fri, 03 Mar 2006 08:48:05 +0100
+ -- Noèl Köthe <noel at debian.org>  Sat, 04 Mar 2006 23:56:28 +0100
 
 kolab-cyrus-imapd (2.2.12-3) experimental; urgency=low
 

Modified: trunk/kolab-cyrus-imapd/debian/cyrus.conf
===================================================================
--- trunk/kolab-cyrus-imapd/debian/cyrus.conf	2006-03-04 22:48:33 UTC (rev 353)
+++ trunk/kolab-cyrus-imapd/debian/cyrus.conf	2006-03-04 22:58:31 UTC (rev 354)
@@ -32,7 +32,7 @@
 	# add or remove based on preferences
 	imap		cmd="imapd -U 30" listen="imap" prefork=0 maxchild=100
 	#imaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100
-	#pop3		cmd="pop3d -U 30" listen="pop3" prefork=0 maxchild=50
+	pop3		cmd="pop3d -U 30" listen="pop3" prefork=0 maxchild=50
 	#pop3s		cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=50
 	#nntp		cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100
 	#nntps		cmd="nntpd -s -U 30" listen="nntps" prefork=0 maxchild=100

Modified: trunk/kolab-cyrus-imapd/debian/imapd.conf
===================================================================
--- trunk/kolab-cyrus-imapd/debian/imapd.conf	2006-03-04 22:48:33 UTC (rev 353)
+++ trunk/kolab-cyrus-imapd/debian/imapd.conf	2006-03-04 22:58:31 UTC (rev 354)
@@ -301,6 +301,24 @@
 syslog_prefix: cyrus
 
 ##
+## LDAP
+##
+ptloader_sock: /var/run/cyrus/socket/ptsock
+
+ldap_sasl:0
+ldap_uri: ldap://localhost:389
+ldap_base: dc=example,dc=com
+ldap_bind_dn: cn=manager,cn=internal,dc=example,dc=com
+ldap_password: PASSWORD
+ldap_filter: (&(cn=%U)(objectClass=kolabInetOrgPerson))
+ldap_member_base: dc=example,dc=com
+ldap_member_filter: (member=%D)
+ldap_member_method: filter
+ldap_member_attribute: mail
+ldap_group_base: dc=example,dc=com
+ldap_group_filter: cn=%U
+
+##
 ## DEBUGGING
 ##
 # Debugging hook. See /usr/share/doc/cyrus22-common/README.Debian.debug