thomas: server/kolabd/kolabd/templates master.cf.template.in, 1.17, 1.18

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	master.cf.template.in 
Log Message:
Port mailfilter_addr change to master.cf.template.in from 2.1 branch, too:
cvs diff -r 1.14.2.1 -r 1.14.2.2 master.cf.template.in | patch master.cf.template.in


Index: master.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- master.cf.template.in	26 Jul 2007 12:43:02 -0000	1.17
+++ master.cf.template.in	8 Oct 2007 15:31:29 -0000	1.18
@@ -55,9 +55,9 @@
     -o disable_dns_lookups=yes
 # SMTP interface for injecting mail back into postfix
 # from kolabfilter
-127.0.0.1:10025 inet n	-	n	-	-  smtpd
+@@@mailfilter_addr@@@:10025 inet n	-	n	-	-  smtpd
 @@@if postfix-enable-virus-scan@@@
-    -o content_filter=smtp-amavis:[127.0.0.1]:10024
+    -o content_filter=smtp-amavis:[@@@mailfilter_addr@@@]:10024
 @@@else@@@
     -o content_filter=
 @@@endif@@@
@@ -77,7 +77,7 @@
     -o smtpd_hard_error_limit=1000
 # SMTP interface for injecting mail back into postfix
 # from amavis
-127.0.0.1:10026 inet n	-	n	-	-  smtpd
+@@@mailfilter_addr@@@:10026 inet n	-	n	-	-  smtpd
     -o content_filter=
     -o cleanup_service_name=post-cleanup
     -o local_recipient_maps=