Merge pull request #329 from HolySephi/master

Set myhostname to $mydomain in postfix correctly

lib/configfiles/gentoo.xml

@@ -1061,11 +1061,11 @@ program_directory = /usr/libexec/postfix
 sendmail_path = /usr/sbin/sendmail
 
 ## General Postfix configuration
-# should be the default domain from your provider eg. "server100.provider.tld"
+# FQDN from Froxlor
 mydomain = <SERVERNAME>
 
-# should be different from $mydomain eg. "mail.$mydomain"
+# set myhostname to $mydomain because Froxlor alrady uses a FQDN
-myhostname = mail.$mydomain
+myhostname = $mydomain
 
 mydestination = $myhostname,
 	$mydomain,

lib/configfiles/jessie.xml

@@ -1115,23 +1115,12 @@ data_directory = /var/lib/postfix
 #
 #default_privs = nobody
 
-# INTERNET HOST AND DOMAIN NAMES
+# FQDN from Froxlor
-#
-# The myhostname parameter specifies the internet hostname of this
-# mail system. The default is to use the fully-qualified domain name
-# from gethostname(). $myhostname is used as a default value for many
-# other configuration parameters.
-#
-myhostname = mail.$mydomain
-#myhostname = virtual.domain.tld
-
-# The mydomain parameter specifies the local internet domain name.
-# The default is to use $myhostname minus the first component.
-# $mydomain is used as a default value for many other configuration
-# parameters.
-#
 mydomain = <SERVERNAME>
 
+# set myhostname to $mydomain because Froxlor alrady uses a FQDN
+myhostname = $mydomain
+
 # SENDING MAIL
 #
 # The myorigin parameter specifies the domain that locally-posted

lib/configfiles/precise.xml

@@ -512,11 +512,11 @@ root:               root@<SERVERNAME>
 						backup="true">
 						<content><![CDATA[
 ## General Postfix configuration
-# should be the default domain from your provider eg. "server100.provider.tld"
+# FQDN from Froxlor
 mydomain = <SERVERNAME>
 
-# should be different from $mydomain eg. "mail.$mydomain"
+# set myhostname to $mydomain because Froxlor alrady uses a FQDN
-myhostname = mail.$mydomain
+myhostname = $mydomain
 
 mydestination = $myhostname,
 	$mydomain,

lib/configfiles/rhel_centos.xml

@@ -176,11 +176,11 @@ query = SELECT gid FROM mail_users WHERE email = '%s'
 						backup="true">
 						<content><![CDATA[
 ## General Postfix configuration
-
+# FQDN from Froxlor
 mydomain = <SERVERNAME>
 
-# should be different from $mydomain eg. "mail.$mydomain"
+# set myhostname to $mydomain because Froxlor alrady uses a FQDN
-myhostname = mail.$mydomain
+myhostname = $mydomain
 
 mydestination = $myhostname,
 	$mydomain,

lib/configfiles/trusty.xml

@@ -541,11 +541,11 @@ root:               root@<SERVERNAME>
 						backup="true">
 						<content><![CDATA[
 ## General Postfix configuration
-# should be the default domain from your provider eg. "server100.provider.tld"
+# FQDN from Froxlor
 mydomain = <SERVERNAME>
 
-# should be different from $mydomain eg. "mail.$mydomain"
+# set myhostname to $mydomain because Froxlor alrady uses a FQDN
-myhostname = mail.$mydomain
+myhostname = $mydomain
 
 mydestination = $myhostname,
 	$mydomain,

lib/configfiles/wheezy.xml

@@ -950,29 +950,12 @@ data_directory = /var/lib/postfix
 #default_privs = nobody
 
 # INTERNET HOST AND DOMAIN NAMES
-#
+# FQDN from Froxlor
-# The myhostname parameter specifies the internet hostname of this
-# mail system. The default is to use the fully-qualified domain name
-# from gethostname(). $myhostname is used as a default value for many
-# other configuration parameters.
-#
-# Froxlor Note: $myhostname can and should be the same as $mydomain as long as
-# you don't intend to send mail to it (it will be considered local, not virtual)
-# for the case of a subdomain, $mydomain *must* be equal to $myhostname,
-# otherwise you cannot use the main domain for virtual transport.
-# also check the note about $mydomain below.
-myhostname = mail.$mydomain
-#myhostname = virtual.domain.tld
-
-# The mydomain parameter specifies the local internet domain name.
-# The default is to use $myhostname minus the first component.
-# $mydomain is used as a default value for many other configuration
-# parameters.
-#
-# Froxlor Note: We are using a default here but that may or may not make sense,
-# depending on your dns configuration, please check yourself.
 mydomain = <SERVERNAME>
 
+# set myhostname to $mydomain because Froxlor alrady uses a FQDN
+myhostname = $mydomain
+
 # SENDING MAIL
 #
 # The myorigin parameter specifies the domain that locally-posted