2 commits - ucs/conffiles

[Christoph Wickert]

 ucs/conffiles/etc/postfix/main.cf.d/10_general |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c6f28ab43be2d4021c364ff60f8a16a2bbbb9fb0
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Sep 9 18:44:52 2015 +0200

    Implement mail/postfix/smtpd/banner (from upstream univention-mail-postfix rev. 21923)

diff --git a/ucs/conffiles/etc/postfix/main.cf.d/10_general b/ucs/conffiles/etc/postfix/main.cf.d/10_general
index 9cab80d..3bf1d28 100644
--- a/ucs/conffiles/etc/postfix/main.cf.d/10_general
+++ b/ucs/conffiles/etc/postfix/main.cf.d/10_general
@@ -85,3 +85,8 @@ yesno = { True: 'yes', False: 'no' }
 print 'disable_vrfy_command = %s' % yesno.get(configRegistry.is_true('mail/smtp/VRFY/disabled', False))
 @!@
 
+# banner
+@!@
+if configRegistry.get('mail/postfix/smtpd/banner'):
+	print 'smtpd_banner = %s' % configRegistry['mail/postfix/smtpd/banner']
+@!@


commit 5de375135e141c2124d30470d9953f1c76c73871
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Wed Sep 9 18:41:27 2015 +0200

    Don't list domains in both mydestination and virtual_mailbox_domains (#5214)

diff --git a/ucs/conffiles/etc/postfix/main.cf.d/10_general b/ucs/conffiles/etc/postfix/main.cf.d/10_general
index e32fcd0..9cab80d 100644
--- a/ucs/conffiles/etc/postfix/main.cf.d/10_general
+++ b/ucs/conffiles/etc/postfix/main.cf.d/10_general
@@ -49,7 +49,7 @@ print 'inet_protocols = %s' % configRegistry.get('mail/postfix/inet/protocols',
 
 print
 
-print 'mydestination = ldap:/etc/postfix/ldap.virtualdomains, %s' % configRegistry.get('mail/postfix/mydestination', '$myhostname, localhost.$mydomain, localhost')
+print 'mydestination = %s' % configRegistry.get('mail/postfix/mydestination', '$myhostname, localhost.$mydomain, localhost')
 print 'mynetworks = %s' % configRegistry.get('mail/postfix/mynetworks', '127.0.0.0/8')
 
 print