bernhard: server/kolabd/kolabd/templates main.cf.template.in, 1.9, 1.10

[cvs at kolab.org]

Author: bernhard

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

Modified Files:
	main.cf.template.in 
Log Message:
* templates/master.cf.template.in: added envelope_recipient
	to masquerade_classes. According to Postfix' documention it was
	missing to allow for delivery to local machines, which we do
	not want to do in a standard Kolab Server setup. 
	Removed the masquerade_exceptions = root line, as we can get
	the information where an email to root at machine came from also
	from the connection itself and it is good to be closer to the default.
* Resolved conflict in doc/README.webgui.in.


Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- main.cf.template.in	26 Mar 2006 18:47:02 -0000	1.9
+++ main.cf.template.in	28 Aug 2006 11:15:11 -0000	1.10
@@ -47,7 +47,10 @@
 
 # 
 masquerade_domains = $mydomain
-masquerade_exceptions = root
+#       Kolab Server does _not_ want to forward to local machines by default,
+#       so we can add "envelope_recipient" to masquerade_classes:
+masquerade_classes = envelope_sender, envelope_recipient,
+                     header_sender, header_recipient
 
 #   smtp daemon
 #smtpd_banner = $myhostname ESMTP $mail_name