gunnar: server/kolabd/kolabd ChangeLog, 1.106, 1.107 Makefile.am, 1.29, 1.30 kolab.globals.in, 1.2, 1.3 kolabconf.in, 1.3, NONE
cvs at kolab.org
cvs at kolab.org
Wed Aug 1 17:03:48 CEST 2007
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv22290
Modified Files:
ChangeLog Makefile.am kolab.globals.in
Removed Files:
kolabconf.in
Log Message:
Removed kolabconf from the kolabd package into its own package.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- ChangeLog 31 Jul 2007 11:54:33 -0000 1.106
+++ ChangeLog 1 Aug 2007 15:03:46 -0000 1.107
@@ -1,3 +1,13 @@
+2007-08-01 Gunnar Wrobel <p at rdus.de>
+
+ * Makefile.am:
+ * kolabd/kolabconf.in:
+ * kolab.globals.in :
+
+ Moved kolabconf in its own package and modified the global
+ configuration file so that it provides all necessary configuration
+ for the kolabconf script.
+
2007-07-31 Gunnar Wrobel <p at rdus.de>
* kolab.globals.in (kolab_locals):
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile.am 27 Jul 2007 20:28:31 -0000 1.29
+++ Makefile.am 1 Aug 2007 15:03:46 -0000 1.30
@@ -144,11 +144,9 @@
if OPENPKG
kolabsbin_FILES = kolabd \
- kolabconf \
kolabcheckperm
else
kolabsbin_FILES = kolabd \
- kolabconf \
kolabcheckperm \
dist_conf/kolabsrv
endif
@@ -206,13 +204,6 @@
CLEANFILES += kolab_sslcert.sh
EXTRA_DIST += kolab_sslcert.sh.in
-kolabconf: kolabconf.in
- @$(mkinstalldirs) .
- $(do_subst) <$(srcdir)/kolabconf.in >$@
- chmod a+x kolabconf
-CLEANFILES += kolabconf
-EXTRA_DIST += kolabconf.in
-
kolabcheckperm: kolabcheckperm.in
@$(mkinstalldirs) .
$(do_subst) <$(srcdir)/kolabcheckperm.in >$@
@@ -583,7 +574,6 @@
chmod 600 $(DESTDIR)$(kolabconfigdir)/kolab.conf
chmod 744 $(DESTDIR)$(kolabnamespacedir)/*
chmod 744 $(DESTDIR)$(sbindir)/kolabd
- chmod 744 $(DESTDIR)$(sbindir)/kolabconf
chmod 744 $(DESTDIR)$(sbindir)/kolabcheckperm
chmod 755 $(DESTDIR)$(bindir)/kolabpasswd
if ! OPENPKG
Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab.globals.in 31 Jul 2007 11:54:33 -0000 1.2
+++ kolab.globals.in 1 Aug 2007 15:03:46 -0000 1.3
@@ -42,3 +42,9 @@
kolab_musr: @kolab_musr@
kolab_mgrp: @kolab_mgrp@
hashmethod: @sbindir@/slappasswd -s
+templatedir: @sysconfdir@/kolab/templates
+kolabdir: @sysconfdir@/kolab/
+postmapping: @sbindir@/postmap -o @emailserver_confdir@
+KOLABRC: @KOLABRC@
+ftpserver_pidfile: @ftpserver_pidfile@
+sbindir: @sbindir@
\ No newline at end of file
--- kolabconf.in DELETED ---
More information about the commits
mailing list