gunnar: server/kolabd/kolabd ChangeLog, 1.102, 1.103 Makefile.am, 1.26, 1.27 kolab.globals, 1.3, 1.4 kolabd.in, 1.3, 1.4 dirservnotify.in, 1.1, NONE dirservupdate.in, 1.1, NONE

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	ChangeLog Makefile.am kolab.globals kolabd.in 
Removed Files:
	dirservnotify.in dirservupdate.in 
Log Message:
Removed dirserv-support from kolabd.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- ChangeLog	26 Jul 2007 12:43:02 -0000	1.102
+++ ChangeLog	26 Jul 2007 15:04:50 -0000	1.103
@@ -1,3 +1,17 @@
+2007-07-26  Gunnar Wrobel  <p at rdus.de>
+
+	* Makefile.am:
+	* dirservnotify.in:
+	* dirservupdate.in:
+	* kolab.globals:
+	* kolabd.in:
+
+	Removing "dirserv"-support from kolabd. The corresponding
+	perl-module has been left untouched since its first import in
+	kolab CVS and still uses the very first Kolab schema. It does not
+	work at the moment. If somebody thinks this should be revived,
+	please revert and fix the corresponding Kolab::DirServ module.
+
 2007-07-26  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* templates/master.cf.template.in: Use spaces instead of tabs

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.am	17 Jul 2007 15:26:05 -0000	1.26
+++ Makefile.am	26 Jul 2007 15:04:50 -0000	1.27
@@ -27,8 +27,6 @@
 	kolabquotawarn \
 	kolab_upgrade \
 	kolab_smtpdpolicy \
-	dirservnotify \
-	dirservupdate \
 	kolabdcachetool
 
 
@@ -242,20 +240,6 @@
 	chmod a+x kolabdcachetool
 CLEANFILES += kolabdcachetool
 EXTRA_DIST += kolabdcachetool.in
-
-dirservnotify: dirservnotify.in
-	@$(mkinstalldirs) .
-	$(do_subst) <$(srcdir)/dirservnotify.in >$@
-	chmod a+x dirservnotify
-CLEANFILES += dirservnotify
-EXTRA_DIST += dirservnotify.in
-
-dirservupdate: dirservupdate.in
-	@$(mkinstalldirs) .
-	$(do_subst) <$(srcdir)/dirservupdate.in >$@
-	chmod a+x dirservupdate
-CLEANFILES += dirservupdate
-EXTRA_DIST += dirservupdate.in
 
 namespace/libexec/adduser: namespace/libexec/adduser.in
 	@$(mkinstalldirs) namespace/libexec

Index: kolab.globals
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab.globals	28 Mar 2007 01:51:35 -0000	1.3
+++ kolab.globals	26 Jul 2007 15:04:50 -0000	1.4
@@ -29,10 +29,6 @@
 user_field_modified : modifytimestamp
 user_field_quota : cyrus-userquota
 user_object_class : inetOrgPerson
-dirserv_mailbox_server :
-dirserv_mailbox_user :
-dirserv_mailbox_password :
-dirserv_poll_period : 120
 maildefer_size: 
 maildefer_header: 
 maildefer_listen: 127.0.0.1:10024

Index: kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabd.in	27 Nov 2005 23:57:02 -0000	1.3
+++ kolabd.in	26 Jul 2007 15:04:50 -0000	1.4
@@ -35,7 +35,6 @@
 #    Y: Cyrus
 #    B: Backend
 #    KC: kolabconf
-#    DS: DirServ
 #    Anything else: the various backends
 #
 
@@ -44,7 +43,6 @@
 use IO::File;
 use Kolab;
 use Kolab::Util;
-use Kolab::DirServ;
 use Kolab::LDAP;
 use Kolab::LDAP::Backend;
 use vars qw(%pids);
@@ -88,7 +86,6 @@
     Kolab::log('K', 'Synchronising');
     Kolab::LDAP::sync;
     Kolab::log('K', 'Reloading addressbook.peers');
-    Kolab::DirServ::reloadPeers;
     Kolab::log('K', 'Finished refresh');
     &run;
 }
@@ -158,7 +155,6 @@
   Kolab::LDAP::Backend::load;
   Kolab::LDAP::Backend::load('user');
   Kolab::LDAP::Backend::load('sf');
-  Kolab::LDAP::Backend::load('dirservd',1);
   
   Kolab::log('K', 'Performing backend startup');
   &Kolab::LDAP::Backend::startup;

--- dirservnotify.in DELETED ---

--- dirservupdate.in DELETED ---