gunnar: server/kolabd/kolabd/dist_conf common, 1.41, 1.42 kolab, 1.53, 1.54

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	common kolab 
Log Message:
Continued fixing of kolab-filter.

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- common	22 Nov 2007 17:08:42 -0000	1.41
+++ common	27 Nov 2007 07:30:24 -0000	1.42
@@ -117,9 +117,9 @@
 	-e 's,[@]resmgr_confdir[@],$(resmgr_confdir),g' \
 	-e 's,[@]resmgr_conffile_grp[@],$(resmgr_conffile_grp),g' \
 	-e 's,[@]resmgr_conffile_usr[@],$(resmgr_conffile_usr),g' \
-	-e 's,[@]resmgr_filterdir[@],$(resmgr_filterdir),g' \
+	-e 's,[@]resmgr_tmpdir[@],$(resmgr_tmpdir),g' \
 	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
-	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
+	-e 's,[@]resmgr_logdir[@],$(resmgr_logdir),g' \
 	-e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
 	-e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- kolab	23 Nov 2007 13:39:32 -0000	1.53
+++ kolab	27 Nov 2007 07:30:24 -0000	1.54
@@ -156,11 +156,11 @@
 
 sysrundir=${localstatedir}/run
 
-resmgr_logfile=${localstatedir}/kolab-filter/log/kolab-filter.log
+resmgr_logdir=${localstatedir}/kolab-filter/log
 resmgr_confdir=${localstatedir}/kolab-filter/scripts
 resmgr_conffile_usr=${kolab_musr}
 resmgr_conffile_grp=${kolab_grp}
-resmgr_filterdir=${localstatedir}/kolab-filter/tmp
+resmgr_tmpdir=${localstatedir}/kolab-filter/tmp
 resmgr_scriptsdir=${localstatedir}/kolab-filter/scripts
 # @l_musr@
 resmgr_usr=${kolab_musr}