richard: server/kolabd/kolabd/dist_conf common, 1.14, 1.15 debian, 1.2, 1.3 kolab, 1.18, 1.19 suse, 1.19, 1.20

cvs at intevation.de cvs at intevation.de
Sun Jan 15 21:32:49 CET 2006


Author: richard

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

Modified Files:
	common debian kolab suse 
Log Message:
split the variable amavisd_confdir into amavisd_conffile and
amavisd_templatedir to give non openpkg based distro more control over
the exact amavisd_templatedir location.



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- common	15 Jan 2006 10:46:35 -0000	1.14
+++ common	15 Jan 2006 20:32:47 -0000	1.15
@@ -19,11 +19,12 @@
 	-e 's,[@]VERSION[@],$(VERSION),g' \
 	-e 's,[@]WITHOPENPKG[@],$(WITHOPENPKG),g' \
 	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
-	-e 's,[@]amavisd_confdir[@],$(amavisd_confdir),g' \
+	-e 's,[@]amavisd_conffile[@],$(amavisd_conffile),g' \
 	-e 's,[@]amavisd_grp[@],$(amavisd_grp),g' \
 	-e 's,[@]amavisd_home[@],$(amavisd_home),g' \
 	-e 's,[@]amavisd_logfile[@],$(amavisd_logfile),g' \
 	-e 's,[@]amavisd_rusr[@],$(amavisd_rusr),g' \
+	-e 's,[@]amavisd_templatedir[@],$(amavisd_templatedir),g' \
 	-e 's,[@]amavisd_usr[@],$(amavisd_usr),g' \
 	-e 's,[@]backupdir[@],$(backupdir),g' \
 	-e 's,[@]backupfiles[@],$(backupfiles),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- debian	15 Jan 2006 10:46:35 -0000	1.2
+++ debian	15 Jan 2006 20:32:47 -0000	1.3
@@ -21,7 +21,8 @@
 # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 perllib=${libdir}/perl5
 
-amavisd_confdir=${sysconfdir}/amavis/conf.d
+amavisd_conffile=${sysconfdir}/amavis/conf.d
+amavisd_templatedir=${sysconfdir}/amavis/conf.d
 amavisd_logfile=${localstatedir}/log/amavis.log
 amavisd_home=${localstatedir}/lib//amavis
 amavisd_rusr=kolab-r

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- kolab	15 Jan 2006 10:46:35 -0000	1.18
+++ kolab	15 Jan 2006 20:32:47 -0000	1.19
@@ -31,7 +31,8 @@
 # /kolab/bin/perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 perllib=${libdir}/perl/vendor_perl/5.8.7
 
-amavisd_confdir=${sysconfdir}/amavisd
+amavisd_conffile=${sysconfdir}/amavisd/amavisd.conf
+amavisd_templatedir=${sysconfdir}/amavisd/templates
 amavisd_logfile=${localstatedir}/amavisd/amavis.log
 amavisd_home=${localstatedir}/amavisd
 # @l_rusr@

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- suse	15 Jan 2006 10:46:35 -0000	1.19
+++ suse	15 Jan 2006 20:32:47 -0000	1.20
@@ -22,7 +22,8 @@
 # perl -V:vendorlib | sed "s/.*'\(.*\)'\;/\1/"
 perllib=${libdir}/perl5/vendor_perl/5.8.7
 
-amavisd_confdir=${sysconfdir}/kolab/amavisd
+amavisd_conffile=${sysconfdir}/amavisd.conf
+amavisd_templatedir=${sysconfdir}/amavisd/templates.d
 amavisd_logfile=${localstatedir}/log/amavisd
 amavisd_home=${localstatedir}/amavisd
 amavisd_rusr=vscan





More information about the commits mailing list