Fix mailutils mail domain default.

diff --git a/all_new_2018/linkable_etc_files/mail/etc/mailutils.conf b/all_new_2018/linkable_etc_files/mail/etc/mailutils.conf
new file mode 100644 (file)
index 0000000..44efe26
--- /dev/null
+++ b/all_new_2018/linkable_etc_files/mail/etc/mailutils.conf
@@ -0,0 +1,4 @@
+# mailutils by default uses the FQDN as the mail domain name, fix this
+address {
+  email-domain REPLACE_maildomain_ECALPER;
+};

diff --git a/all_new_2018/setup_mail.sh b/all_new_2018/setup_mail.sh
index 18d7c310719bc5aea4b2eab8f83e15e2ebe9eba5..60eda3164151d63d8ffedf041186072defba7eb4 100755 (executable)
--- a/all_new_2018/setup_mail.sh
+++ b/all_new_2018/setup_mail.sh
@@ -31,6 +31,7 @@ fi
 
 # Link and adapt mail-server-specific /etc/ files.
 ./hardlink_etc.sh mail
+sed -i "s/REPLACE_maildomain_ECALPER/${mail_domain}/g" /etc/mailutils.conf
 sed -i "s/REPLACE_Domain_ECALPER/${mail_domain}/g" /etc/opendkim.conf
 sed -i "s/REPLACE_Selector_ECALPER/${dkim_selector}/g" /etc/opendkim.conf
 sed -i "s/REPLACE_myhostname_ECALPER/$(hostname -f)/g" /etc/postfix/main.cf