martin: server/kolabd/kolabd/dist_conf common, 1.24, 1.25 debian, 1.5, 1.6 kolab, 1.30, 1.31 mandriva, 1.4, 1.5 suse, 1.39, 1.40

[cvs at intevation.de]

Author: martin

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

Modified Files:
	common debian kolab mandriva suse 
Log Message:
Martin Konold: Apply patch from Gunnar Wrobel. (Make resmgr_scriptsdir a variable)


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- common	9 Mar 2006 21:35:08 -0000	1.24
+++ common	9 Mar 2006 21:37:37 -0000	1.25
@@ -118,6 +118,7 @@
 	-e 's,[@]resmgr_filterdir[@],$(resmgr_filterdir),g' \
 	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
 	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
+	-e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
 	-e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
 	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- debian	9 Mar 2006 21:35:08 -0000	1.5
+++ debian	9 Mar 2006 21:37:37 -0000	1.6
@@ -126,6 +126,7 @@
 resmgr_logfile=${localstatedir}/log/resmgr.log
 resmgr_confdir=${sysconfdir}/resmgr
 resmgr_filterdir=${localstatedir}/resmgr/filter
+resmgr_scriptsdir=${resmgr_confdir}
 resmgr_usr=kolab
 resmgr_grp=kolab-n
 

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- kolab	9 Mar 2006 21:35:08 -0000	1.30
+++ kolab	9 Mar 2006 21:37:37 -0000	1.31
@@ -171,6 +171,7 @@
 resmgr_conffile_usr=${kolab_musr}
 resmgr_conffile_grp=${kolab_grp}
 resmgr_filterdir=${localstatedir}/resmgr/filter
+resmgr_scriptsdir=${resmgr_confdir}
 # @l_musr@
 resmgr_usr=kolab
 # @l_ngrp@

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mandriva	9 Mar 2006 21:35:08 -0000	1.4
+++ mandriva	9 Mar 2006 21:37:37 -0000	1.5
@@ -66,3 +66,4 @@
 
 sysrundir = /var/run
 
+resmgr_scriptsdir=${resmgr_confdir}

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- suse	9 Mar 2006 21:35:08 -0000	1.39
+++ suse	9 Mar 2006 21:37:37 -0000	1.40
@@ -150,6 +150,7 @@
 resmgr_conffile_usr=nobody
 resmgr_conffile_grp=nobody
 resmgr_filterdir=${localstatedir}/resmgr/filter
+resmgr_scriptsdir=${resmgr_confdir}
 resmgr_usr=root
 resmgr_grp=root
 
@@ -182,3 +183,4 @@
 	/etc/sysconfig/ldap \
 	/etc/sysconfig/saslauthd \
 	/usr/lib/sasl2/smtpd.conf
+