Merge branch 'master' of github.com:Froxlor/Froxlor

2013-07-14 11:24:17 +02:00
parent d4d02bfa7d fbb4c81e53
commit ab8975ccc3
4 changed files with 12 additions and 11 deletions
--- a/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/debian_wheezy/postfix_courier/etc_postfix_main.cf
@@ -688,8 +688,9 @@ smtpd_sender_restrictions = permit_mynetworks,
 smtpd_client_restrictions = permit_mynetworks,
 	permit_sasl_authenticated,
 	reject_unknown_client_hostname
-
-smtpd_relay_restrictions = permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination
+smtpd_relay_restrictions = permit_mynetworks,
+	permit_sasl_authenticated,
+	defer_unauth_destination

 # Maximum size of Message in bytes (50MB)
 message_size_limit = 52428800
--- a/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/debian_wheezy/postfix_dovecot/etc_postfix_main.cf
@@ -688,8 +688,9 @@ smtpd_sender_restrictions = permit_mynetworks,
 smtpd_client_restrictions = permit_mynetworks,
 	permit_sasl_authenticated,
 	reject_unknown_client_hostname
-
-smtpd_relay_restrictions = permit_mynetworks,permit_sasl_authenticated,defer_unauth_destination
+smtpd_relay_restrictions = permit_mynetworks,
+	permit_sasl_authenticated,
+	defer_unauth_destination

 # Maximum size of Message in bytes (50MB)
 message_size_limit = 52428800
--- a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf
@@ -36,10 +36,9 @@ smtpd_sender_restrictions = permit_mynetworks,
 smtpd_client_restrictions = permit_mynetworks,
 	permit_sasl_authenticated,
 	reject_unknown_client_hostname
-
-# Postfix 2.10 requires this option. Postfix < 2.10 ignores this.
-# The option is intentionally left empty.
-smtpd_relay_restrictions = 
+smtpd_relay_restrictions = permit_mynetworks,
+	permit_sasl_authenticated,
+	defer_unauth_destination

 # Maximum size of Message in bytes (512MB)
 message_size_limit = 536870912
--- a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf
@@ -43,9 +43,9 @@ smtpd_client_restrictions = permit_mynetworks,
 	permit_sasl_authenticated,
 	reject_unknown_client

-# Postfix 2.10 requires this option. Postfix < 2.10 ignores this.
-# The option is intentionally left empty.
-smtpd_relay_restrictions = 
+smtpd_relay_restrictions = permit_mynetworks,
+	permit_sasl_authenticated,
+	defer_unauth_destination

 # Maximum size of Message in bytes (512MB)
 message_size_limit = 536870912