myhostname should be different from mydomain in postfix's main.cf - use mail. to avoid confusion

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2013-03-16 11:59:52 +01:00
parent d3e902ac63
commit 236ba6abfb
12 changed files with 15 additions and 12 deletions
--- a/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>

 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain

 mydestination = $myhostname,
 	$mydomain,
--- a/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>

 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain

 mydestination = $myhostname,
 	$mydomain,
--- a/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf
+++ b/templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf
@@ -87,7 +87,7 @@ command_directory = /usr/local/sbin
 daemon_directory = /usr/local/libexec/postfix
 data_directory = /var/db/postfix
 mail_owner = postfix
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 mydomain = <SERVERNAME>
 myorigin = $mydomain

--- a/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_main.cf
+++ b/templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_main.cf
@@ -34,7 +34,8 @@ transport_maps = hash:/etc/postfix/transport
 sender_canonical_maps = hash:/etc/postfix/sender_canonical
 masquerade_exceptions = root
 masquerade_classes = envelope_sender, header_sender, header_recipient
-myhostname = <SERVERNAME>
+mydomain = <SERVERNAME>
+myhostname = mail.$mydomain
 program_directory = /usr/lib/postfix
 masquerade_domains =
 mydestination = $myhostname $mydomain localhost localhost.$mydomain
--- a/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_main.cf
@@ -1,7 +1,9 @@
 ## General Postfix configuration

+mydomain = <SERVERNAME>
+
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain

 mydestination = $myhostname,
 	$mydomain,
--- a/templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf
+++ b/templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf
@@ -35,7 +35,7 @@ transport_maps = hash:/etc/postfix/transport
 sender_canonical_maps = hash:/etc/postfix/sender_canonical
 masquerade_exceptions = root
 masquerade_classes = envelope_sender, header_sender, header_recipient
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 mydomain = <SERVERNAME>
 program_directory = /usr/lib/postfix
 masquerade_domains =
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>

 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain

 mydestination = $myhostname,
 	$mydomain,
--- a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>

 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain

 mydestination = $myhostname,
 	$mydomain,
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>

 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain

 mydestination = $myhostname,
 	$mydomain,
--- a/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>

 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain

 mydestination = $myhostname,
 	$mydomain,
--- a/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>

 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain

 mydestination = $myhostname,
 	$mydomain,
--- a/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_main.cf
+++ b/templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_main.cf
@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>

 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain

 mydestination = $myhostname,
 	$mydomain,