From a61d02999c51beaa053131782d2de6351fe00bf9 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 23 Oct 2016 20:37:33 +0100
Subject: [PATCH] Include a mail subdomain

---
 src/freedombone-base-email | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 028d58582..b5c461daf 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -790,7 +790,7 @@ function install_email_with_tor {
     echo "dc_eximconfig_configtype='internet'" > /etc/exim4/update-exim4.conf.conf
     if [[ $ONION_ONLY == "no" ]]; then
         # both ICANN and onion domains
-        echo "dc_other_hostnames='${DEFAULT_DOMAIN_NAME};${EMAIL_ONION_HOSTNAME}'" >> /etc/exim4/update-exim4.conf.conf
+        echo "dc_other_hostnames='${DEFAULT_DOMAIN_NAME};mail.${DEFAULT_DOMAIN_NAME};${EMAIL_ONION_HOSTNAME}'" >> /etc/exim4/update-exim4.conf.conf
     else
         echo "dc_other_hostnames='${EMAIL_ONION_HOSTNAME}'" >> /etc/exim4/update-exim4.conf.conf
     fi
@@ -917,7 +917,7 @@ function install_email_basic {
     sed -i 's|pam_mail.so nopen|pam_mail.so dir=~/Maildir nopen|g' /etc/pam.d/su
 
     echo "dc_eximconfig_configtype='internet'" > /etc/exim4/update-exim4.conf.conf
-    echo "dc_other_hostnames='${DEFAULT_DOMAIN_NAME}'" >> /etc/exim4/update-exim4.conf.conf
+    echo "dc_other_hostnames='${DEFAULT_DOMAIN_NAME};mail.${DEFAULT_DOMAIN_NAME}'" >> /etc/exim4/update-exim4.conf.conf
     echo "dc_local_interfaces=''" >> /etc/exim4/update-exim4.conf.conf
     echo "dc_readhost=''" >> /etc/exim4/update-exim4.conf.conf
     echo "dc_relay_domains=''" >> /etc/exim4/update-exim4.conf.conf
-- 
GitLab