richard: server/kolabd/kolabd/templates amavisd.conf.template.in, 1.4, 1.5

[cvs at intevation.de]

Author: richard

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

Modified Files:
	amavisd.conf.template.in 
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: amavisd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/amavisd.conf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- amavisd.conf.template.in	11 Jan 2006 14:49:05 -0000	1.4
+++ amavisd.conf.template.in	15 Jan 2006 20:32:47 -0000	1.5
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=@amavisd_confdir@/amavisd.conf
+TARGET=@amavisd_conffile@
 PERMISSIONS=0640
 OWNERSHIP=@amavisd_usr@:@amavisd_grp@
 KOLAB_META_END
@@ -335,8 +335,8 @@
 # If notification template files are collectively available in some directory,
 # use read_l10n_templates which calls read_text for each known template.
 #
-read_l10n_templates('@amavisd_confdir@/templates/en_US');
-#read_l10n_templates('@amavisd_confdir@/templates/de');
+read_l10n_templates('@amavisd_templatedir@/en_US');
+#read_l10n_templates('@amavisd_templatedir@/de');
 
 
 # Here is an overall picture (sequence of events) of how pieces fit together