From 03a1f9b9b17ee35e3bc8f337e1aab3be6aa67c3e Mon Sep 17 00:00:00 2001 From: Florian Wicke Date: Thu, 3 Mar 2016 17:35:13 +0100 Subject: [PATCH 01/11] Update jessie.xml --- lib/configfiles/jessie.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml index b2aac784..ce223da0 100644 --- a/lib/configfiles/jessie.xml +++ b/lib/configfiles/jessie.xml @@ -1122,7 +1122,7 @@ data_directory = /var/lib/postfix # from gethostname(). $myhostname is used as a default value for many # other configuration parameters. # -myhostname = mail.$mydomain +myhostname = $mydomain #myhostname = virtual.domain.tld # The mydomain parameter specifies the local internet domain name. From e9e92149101e5cf2538bcc40c9a4c8df49d65ef2 Mon Sep 17 00:00:00 2001 From: Florian Wicke Date: Thu, 3 Mar 2016 17:36:52 +0100 Subject: [PATCH 02/11] Update precise.xml --- lib/configfiles/precise.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml index f99805c5..c659317e 100644 --- a/lib/configfiles/precise.xml +++ b/lib/configfiles/precise.xml @@ -516,7 +516,7 @@ root: root@ mydomain = # should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain +myhostname = $mydomain mydestination = $myhostname, $mydomain, From 28b3eb9585b304e2b19a696378b9856c70c58994 Mon Sep 17 00:00:00 2001 From: Florian Wicke Date: Thu, 3 Mar 2016 17:37:20 +0100 Subject: [PATCH 03/11] Update rhel_centos.xml --- lib/configfiles/rhel_centos.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/rhel_centos.xml b/lib/configfiles/rhel_centos.xml index 37d58363..0aaa4043 100644 --- a/lib/configfiles/rhel_centos.xml +++ b/lib/configfiles/rhel_centos.xml @@ -180,7 +180,7 @@ query = SELECT gid FROM mail_users WHERE email = '%s' mydomain = # should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain +myhostname = $mydomain mydestination = $myhostname, $mydomain, From fc78a51235e940f1a8e538392197d55c77bcf398 Mon Sep 17 00:00:00 2001 From: Florian Wicke Date: Thu, 3 Mar 2016 17:37:47 +0100 Subject: [PATCH 04/11] Update trusty.xml --- lib/configfiles/trusty.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml index f610fdec..2636f7fc 100644 --- a/lib/configfiles/trusty.xml +++ b/lib/configfiles/trusty.xml @@ -545,7 +545,7 @@ root: root@ mydomain = # should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain +myhostname = $mydomain mydestination = $myhostname, $mydomain, From 82c1f29eba5575332490bd8f309b209a66626bce Mon Sep 17 00:00:00 2001 From: Florian Wicke Date: Thu, 3 Mar 2016 17:38:36 +0100 Subject: [PATCH 05/11] Update wheezy.xml --- lib/configfiles/wheezy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml index 440c6ab1..b7b4f169 100644 --- a/lib/configfiles/wheezy.xml +++ b/lib/configfiles/wheezy.xml @@ -961,7 +961,7 @@ data_directory = /var/lib/postfix # 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 = $mydomain #myhostname = virtual.domain.tld # The mydomain parameter specifies the local internet domain name. From 274e5569894c0389bcd13d51fd9cf356b304f798 Mon Sep 17 00:00:00 2001 From: Florian Wicke Date: Fri, 4 Mar 2016 10:27:16 +0100 Subject: [PATCH 06/11] Update gentoo.xml --- lib/configfiles/gentoo.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index f5a94a37..d5ca5b0d 100644 --- a/lib/configfiles/gentoo.xml +++ b/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 = -# should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail.$mydomain +# set myhostname to $mydomain because Froxlor alrady uses a FQDN +myhostname = $mydomain mydestination = $myhostname, $mydomain, From 4bba24801c9fb2b98563c06261cd469e65b5d171 Mon Sep 17 00:00:00 2001 From: Florian Wicke Date: Fri, 4 Mar 2016 10:28:03 +0100 Subject: [PATCH 07/11] Update jessie.xml --- lib/configfiles/jessie.xml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml index ce223da0..9872e732 100644 --- a/lib/configfiles/jessie.xml +++ b/lib/configfiles/jessie.xml @@ -1115,23 +1115,12 @@ data_directory = /var/lib/postfix # #default_privs = nobody -# INTERNET HOST AND DOMAIN NAMES -# -# 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 = $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. -# +# FQDN from Froxlor mydomain = +# set myhostname to $mydomain because Froxlor alrady uses a FQDN +myhostname = $mydomain + # SENDING MAIL # # The myorigin parameter specifies the domain that locally-posted From c18266416745f05298dc1804f9625db974c0b01f Mon Sep 17 00:00:00 2001 From: Florian Wicke Date: Fri, 4 Mar 2016 10:28:36 +0100 Subject: [PATCH 08/11] Update precise.xml --- lib/configfiles/precise.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml index c659317e..e007af93 100644 --- a/lib/configfiles/precise.xml +++ b/lib/configfiles/precise.xml @@ -512,10 +512,10 @@ root: root@ backup="true"> -# should be different from $mydomain eg. "mail.$mydomain" +# set myhostname to $mydomain because Froxlor alrady uses a FQDN myhostname = $mydomain mydestination = $myhostname, From b4a8ed8828938de8623cb840882fbe5be280776d Mon Sep 17 00:00:00 2001 From: Florian Wicke Date: Fri, 4 Mar 2016 10:29:04 +0100 Subject: [PATCH 09/11] Update rhel_centos.xml --- lib/configfiles/rhel_centos.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/configfiles/rhel_centos.xml b/lib/configfiles/rhel_centos.xml index 0aaa4043..a720f2d1 100644 --- a/lib/configfiles/rhel_centos.xml +++ b/lib/configfiles/rhel_centos.xml @@ -176,10 +176,10 @@ query = SELECT gid FROM mail_users WHERE email = '%s' backup="true"> -# should be different from $mydomain eg. "mail.$mydomain" +# set myhostname to $mydomain because Froxlor alrady uses a FQDN myhostname = $mydomain mydestination = $myhostname, From 3119510ef4de2de66329244ca5dbedcac8332bdd Mon Sep 17 00:00:00 2001 From: Florian Wicke Date: Fri, 4 Mar 2016 10:29:54 +0100 Subject: [PATCH 10/11] Update trusty.xml --- lib/configfiles/trusty.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml index 2636f7fc..f04ce27e 100644 --- a/lib/configfiles/trusty.xml +++ b/lib/configfiles/trusty.xml @@ -541,10 +541,10 @@ root: root@ backup="true"> -# should be different from $mydomain eg. "mail.$mydomain" +# set myhostname to $mydomain because Froxlor alrady uses a FQDN myhostname = $mydomain mydestination = $myhostname, From 06862240f036f048b9200c1a1e6fde7cfe68cc93 Mon Sep 17 00:00:00 2001 From: Florian Wicke Date: Fri, 4 Mar 2016 10:31:13 +0100 Subject: [PATCH 11/11] Update wheezy.xml --- lib/configfiles/wheezy.xml | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml index b7b4f169..f7c2bbe0 100644 --- a/lib/configfiles/wheezy.xml +++ b/lib/configfiles/wheezy.xml @@ -950,29 +950,12 @@ data_directory = /var/lib/postfix #default_privs = nobody # INTERNET HOST AND DOMAIN NAMES -# -# 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 = $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. +# FQDN from Froxlor mydomain = +# set myhostname to $mydomain because Froxlor alrady uses a FQDN +myhostname = $mydomain + # SENDING MAIL # # The myorigin parameter specifies the domain that locally-posted