steffen: server/kolab/kolab/templates master.cf.template, 1.10, 1.11

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab/templates
In directory doto:/tmp/cvs-serv16831/kolab/templates

Modified Files:
	master.cf.template 
Log Message:
run resmgr script for all messages containing text/calendar parts after the virus scan stage

Index: master.cf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/master.cf.template,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- master.cf.template	19 Aug 2004 23:28:52 -0000	1.10
+++ master.cf.template	29 Sep 2004 21:09:28 -0000	1.11
@@ -30,13 +30,15 @@
 #ifmail   unix  -       n       n       -       -       pipe flags=F user=ftn argv=/kolab/bin/ifmail -r $nexthop ($recipient)
 #bsmtp    unix  -       n       n       -       -       pipe flags=Fq. user=foo argv=/kolab/bin/bsmtp -f $sender $nexthop $recipient
 465       inet  n       -       n       -       -       smtpd -v -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes 
-#587       inet  n       -       n       -       -       smtpd -v -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
-smtp-amavis unix -	-	n	-	2  smtp
+#587      inet  n       -       n       -       -       smtpd -v -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
+post-cleanup unix  n    -       n       -       0       cleanup -o mime_header_checks=pcre:@l_prefix@/etc/postfix/kolab_header_check
+smtp-amavis unix -	-	n	-	2       smtp
     -o smtp_data_done_timeout=1200
     -o smtp_send_xforward_command=yes
     -o disable_dns_lookups=yes
 127.0.0.1:10025 inet n	-	n	-	-  smtpd
     -o content_filter=
+    -o cleanup_service_name=post-cleanup
     -o local_recipient_maps=
     -o relay_recipient_maps=
     -o smtpd_restriction_classes=
@@ -60,18 +62,10 @@
 @@@endif@@@
     -permithosts @@@kolabhost|join,@@@
 
-kolabgroup     unix  -       n       n       -       1       pipe user=kolab-n flags= argv=@l_prefix@/bin/php 
-    -c @l_prefix@/etc/apache/php.ini
-    -f @l_prefix@/etc/resmgr/resmgr.php 
-    --
-    -s ${sender}
-    -r ${recipient} 
-    -g 
-    -m RM_ACT_MANUAL_IF_CONFLICTS
-kolabres     unix  -       n       n       -       1       pipe user=kolab-n flags= argv=@l_prefix@/bin/php
+kolabresource     unix  -       n       n       -       1       pipe user=kolab-n flags= argv=@l_prefix@/bin/php
     -c @l_prefix@/etc/apache/php.ini
     -f @l_prefix@/etc/resmgr/resmgr.php 
     --
     -s ${sender}
     -r ${recipient} 
-    -m RM_ACT_REJECT_IF_CONFLICTS
+    -m RM_ACT_MANUAL