gunnar: server/kolabd/kolabd/dist_conf centos-clarkconnect, 1.4, 1.5 common, 1.35, 1.36 debian, 1.9, 1.10 gentoo, 1.9, 1.10 kolab, 1.45, 1.46 mandriva, 1.7, 1.8 suse, 1.58, 1.59

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	centos-clarkconnect common debian gentoo kolab mandriva suse 
Log Message:
Replaced path reference to the kolabconf script by a configuration variable.

Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- centos-clarkconnect	20 Oct 2006 18:31:42 -0000	1.4
+++ centos-clarkconnect	27 Jul 2007 18:25:20 -0000	1.5
@@ -41,6 +41,7 @@
 
 kolab_rcdir=${sysconfdir}/rc.d/init.d
 pkgdocdir=${datadir}/doc/kolab-2.1
+kolabconf_script=${sbindir}/kolabconf
 
 # /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 perllib=/usr/lib/perl5/vendor_perl/5.8.5

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- common	11 Feb 2007 14:47:51 -0000	1.35
+++ common	27 Jul 2007 18:25:20 -0000	1.36
@@ -105,6 +105,7 @@
 	-e 's,[@]kolab_susr[@],$(kolab_susr),g' \
 	-e 's,[@]kolab_usr[@],$(kolab_usr),g' \
 	-e 's,[@]kolab_webadmin_rpm[@],$(kolab_webadmin_rpm),g' \
+	-e 's,[@]kolabconf_script[@],$(kolabconf_script),g' \
 	-e 's,[@]ldapserver_argsfile[@],$(ldapserver_argsfile),g' \
 	-e 's,[@]ldapserver_confdir[@],$(ldapserver_confdir),g' \
 	-e 's,[@]ldapserver_dir[@],$(ldapserver_dir),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- debian	19 Jun 2007 06:29:09 -0000	1.9
+++ debian	27 Jul 2007 18:25:20 -0000	1.10
@@ -17,6 +17,7 @@
 
 kolab_rcdir=${sysconfdir}/init.d
 pkgdocdir=${datadir}/doc/kolab
+kolabconf_script=${sbindir}/kolabconf
 
 # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 perllib=${libdir}/perl5

Index: gentoo
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/gentoo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gentoo	11 Feb 2007 14:47:51 -0000	1.9
+++ gentoo	27 Jul 2007 18:25:20 -0000	1.10
@@ -43,6 +43,7 @@
 # FIXME: Would be nice if we could specify the doc-dir from the outside too.
 #        But currently the Makefile.am automatically adds the plain package name
 pkgdocdir=${datadir}/doc
+kolabconf_script=${sbindir}/kolabconf
 
 fsl_logfile=${localstatedir}/fsl/fsl.log
 

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- kolab	20 Jul 2007 20:14:52 -0000	1.45
+++ kolab	27 Jul 2007 18:25:20 -0000	1.46
@@ -20,6 +20,7 @@
 
 kolab_rcdir=${sysconfdir}/rc.d
 pkgdocdir=${datadir}/doc
+kolabconf_script=${sbindir}/kolabconf
 
 # /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 perllib=${libdir}/perl/vendor_perl/5.8.8

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mandriva	9 Mar 2006 21:52:02 -0000	1.7
+++ mandriva	27 Jul 2007 18:25:20 -0000	1.8
@@ -6,6 +6,7 @@
 restricted_kolab_grp=kolab    # kolab-r
 
 rcdir=${sysconfdir}/rc
+kolabconf_script=${sbindir}/kolabconf
 
 kolabd_usr=root
 kolab_statedir = ${localstatedir}/kolab

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- suse	27 Jun 2007 12:08:32 -0000	1.58
+++ suse	27 Jul 2007 18:25:20 -0000	1.59
@@ -20,6 +20,7 @@
 
 kolab_rcdir=${sysconfdir}/init.d
 pkgdocdir=${datadir}/doc/packages/kolab
+kolabconf_script=${sbindir}/kolabconf
 
 # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 perllib=${libdir}/perl5/vendor_perl/5.8.7