richard: server/kolabd/kolabd Makefile.am, 1.43, 1.44 ChangeLog, 1.184, 1.185

[cvs at kolab.org]

Author: richard

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

Modified Files:
	Makefile.am ChangeLog 
Log Message:
kolab.conf removed



Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Makefile.am	20 Jun 2008 16:53:03 -0000	1.43
+++ Makefile.am	26 Aug 2008 17:57:00 -0000	1.44
@@ -31,8 +31,7 @@
 kolabspecialdir = $(kolabconfdir)
 kolabspecial_DATA = kolab.globals
 
-kolabconfig_FILES = kolab.conf \
-	rootDSE.ldif \
+kolabconfig_FILES = rootDSE.ldif \
 	quotawarning.txt
 
 kolabconfigdir = $(kolabconfdir)
@@ -216,7 +215,6 @@
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_statedir)
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
 	chmod 775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
-	chmod 600 $(DESTDIR)$(kolabconfigdir)/kolab.conf
 	chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
 	chmod 744 $(DESTDIR)$(sbindir)/kolabd
 	chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- ChangeLog	20 Aug 2008 20:15:40 -0000	1.184
+++ ChangeLog	26 Aug 2008 17:57:00 -0000	1.185
@@ -1,3 +1,8 @@
+2008-08-26 Richard Bos <richard at radoeka.nl>
+
+	* kolab.conf: removed, see issue2994
+	* Makefile.am: updated to reflect change above
+
 2008-08-20 Richard Bos <richard at radoeka.nl>
 
 	* kolab_bootstrap.in: added syncrepl support, see kolab/issue1755