richard: server/kolabd/kolabd/dist_conf common, 1.8, 1.9 kolab, 1.12, 1.13 suse, 1.9, 1.10

cvs at intevation.de cvs at intevation.de
Fri Dec 30 11:25:23 CET 2005


Author: richard

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

Modified Files:
	common kolab suse 
Log Message:
Change @bindir@/openpkg with @KOLABRC@ to allow other distributions to use
a replacement script for @bindir@/openpkg. 

* dist_conf/{kolab,suse}: added KOLABRC variable
* kolab_bootstrap.in: replaced @bindir@/openpkg with @KOLABRC@
* namespace/kolab.in: replaced @bindir@/openpkg with @KOLABRC@



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- common	19 Dec 2005 09:02:19 -0000	1.8
+++ common	30 Dec 2005 10:25:21 -0000	1.9
@@ -13,6 +13,7 @@
 	-e 's,[@]BASH[@],$(BASHELL),g' \
 	-e 's,[@]PERL[@],$(PERL),g' \
 	-e 's,[@]PHP[@],$(PHP),g' \
+	-e 's,[@]KOLABRC[@],$(KOLABRC),g' \
 	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \
 	-e 's,[@]amavisd_confdir[@],$(amavisd_confdir),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kolab	23 Dec 2005 22:16:54 -0000	1.12
+++ kolab	30 Dec 2005 10:25:21 -0000	1.13
@@ -22,6 +22,7 @@
 BASHELL=${libdir}/openpkg/bash
 PERL=${bindir}/perl
 PHP=${bindir}/php
+KOLABRC=${bindir}/openpkg
 
 kolab_rcdir=${sysconfdir}/rc.d
 pkgdocdir=${datadir}/doc
@@ -100,7 +101,7 @@
 kolab_statedir=${localstatedir}/kolab
 kolab_logdir=${kolab_statedir}/log
 kolab_pidfile=${kolab_statedir}/kolab.pid
-kolab_mailboxuiddb=$(kolab_statedir)/mailbox-uidcache.db
+kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
 
 ldapserver_statedir=${localstatedir}/openldap
 ldapserver_dir=${ldapserver_statedir}/openldap-data

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- suse	26 Dec 2005 08:26:51 -0000	1.9
+++ suse	30 Dec 2005 10:25:21 -0000	1.10
@@ -13,6 +13,7 @@
 BASHELL=/bin/bash
 PERL=${bindir}/perl
 PHP=${bindir}/php
+KOLABRC=${sbindir}/kolab
 
 kolab_rcdir=${sysconfdir}/init.d
 pkgdocdir=${datadir}/doc/packages/kolab
@@ -50,7 +51,7 @@
 emailserver_socket=${libdir}/postfix/lmtp
 emailserver_localstatedir=${localstatedir}/spool/postfix
 emailserver_logfile=${localstatedir}/log/postfix.log
-emailserver_sasl_conffile=$(libdir}/sasl2/smtpd.conf
+emailserver_sasl_conffile=${libdir}/sasl2/smtpd.conf
 emailserver_usr=${kolab_usr}
 emailserver_musr=kolab
 emailserver_grp=${restricted_kolab_grp}
@@ -81,7 +82,7 @@
 kolab_statedir=${localstatedir}/kolab
 kolab_logdir=${localstatedir}/log
 kolab_pidfile=${sysrundir}/kolab.pid
-kolab_mailboxuiddb=$(kolab_statedir)/mailbox-uidcache.db
+kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
 
 ldapserver_statedir=${localstatedir}/lib/ldap
 ldapserver_dir=${localstatedir}/lib/ldap





More information about the commits mailing list