wilde: server/kolabd/kolabd/dist_conf common, 1.47, 1.48 kolab, 1.60, 1.61

[cvs at kolab.org]

Author: wilde

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

Modified Files:
	common kolab 
Log Message:
Added kolabconf template for spamassassin/local.cf.
Fixes kolab/issue2244 and kolab/issue2586.


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- common	19 Mar 2008 19:20:47 -0000	1.47
+++ common	29 Apr 2008 14:50:49 -0000	1.48
@@ -132,6 +132,7 @@
 	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
 	-e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),g' \
 	-e 's,[@]smarty_compiledir[@],$(smarty_compiledir),g' \
+	-e 's,[@]spamassassin_confdir[@],$(spamassassin_confdir),g' \
 	-e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \
 	-e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \
 	-e 's,[@]webserver_cgidir[@],$(webserver_cgidir),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- kolab	19 Mar 2008 21:43:15 -0000	1.60
+++ kolab	29 Apr 2008 14:50:49 -0000	1.61
@@ -37,6 +37,7 @@
 amavisd_grp=${kolab_rgrp}
 amavisd_pkg=amavisd
 
+spamassassin_confdir=${sysconfdir}/spamassassin
 
 fsl_logfile=${localstatedir}/fsl/fsl.log