gunnar: server/kolabd/kolabd/templates slapd.conf.template.in, 1.31, 1.32

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv650/templates

Modified Files:
	slapd.conf.template.in 
Log Message:
kolab/issue3245 (Remove horde.schema and rfc2739.schema from kolab-server/slapd.conf.template) 

Index: slapd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- slapd.conf.template.in	17 Jan 2010 10:20:19 -0000	1.31
+++ slapd.conf.template.in	17 Jul 2010 13:59:14 -0000	1.32
@@ -26,8 +26,22 @@
 include @ldapserver_schemadir@/core.schema
 include @ldapserver_schemadir@/cosine.schema
 include @ldapserver_schemadir@/inetorgperson.schema
-include @ldapserver_schemadir@/rfc2739.schema
 include @ldapserver_schemadir@/kolab2.schema
+
+# Only include this in case you need the calFBURL attribute in
+# kolabInetOrgPerson objects.
+# see also kolab/issue3245 (https://issues.kolab.org/issue3245)
+#
+# The schema remains available at
+# /kolab/var/kolab/www/client/turba/scripts/ldap/rfc2739.schema
+#include @ldapserver_schemadir@/rfc2739.schema
+
+# Only include this in case you want to store the preferences of the
+# kolab web client in LDAP.
+# see also kolab/issue3245 (https://issues.kolab.org/issue3245)
+#
+# The schema remains available at
+# /kolab/var/kolab/www/client/scripts/ldap/horde.schema
 #include @ldapserver_schemadir@/horde.schema
 
 pidfile		@ldapserver_pidfile@