Browse Source

Include a mail subdomain

Bob Mottram 8 years ago
parent
commit
a61d02999c
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      src/freedombone-base-email

+ 2
- 2
src/freedombone-base-email View File

790
     echo "dc_eximconfig_configtype='internet'" > /etc/exim4/update-exim4.conf.conf
790
     echo "dc_eximconfig_configtype='internet'" > /etc/exim4/update-exim4.conf.conf
791
     if [[ $ONION_ONLY == "no" ]]; then
791
     if [[ $ONION_ONLY == "no" ]]; then
792
         # both ICANN and onion domains
792
         # both ICANN and onion domains
793
-        echo "dc_other_hostnames='${DEFAULT_DOMAIN_NAME};${EMAIL_ONION_HOSTNAME}'" >> /etc/exim4/update-exim4.conf.conf
793
+        echo "dc_other_hostnames='${DEFAULT_DOMAIN_NAME};mail.${DEFAULT_DOMAIN_NAME};${EMAIL_ONION_HOSTNAME}'" >> /etc/exim4/update-exim4.conf.conf
794
     else
794
     else
795
         echo "dc_other_hostnames='${EMAIL_ONION_HOSTNAME}'" >> /etc/exim4/update-exim4.conf.conf
795
         echo "dc_other_hostnames='${EMAIL_ONION_HOSTNAME}'" >> /etc/exim4/update-exim4.conf.conf
796
     fi
796
     fi
917
     sed -i 's|pam_mail.so nopen|pam_mail.so dir=~/Maildir nopen|g' /etc/pam.d/su
917
     sed -i 's|pam_mail.so nopen|pam_mail.so dir=~/Maildir nopen|g' /etc/pam.d/su
918
 
918
 
919
     echo "dc_eximconfig_configtype='internet'" > /etc/exim4/update-exim4.conf.conf
919
     echo "dc_eximconfig_configtype='internet'" > /etc/exim4/update-exim4.conf.conf
920
-    echo "dc_other_hostnames='${DEFAULT_DOMAIN_NAME}'" >> /etc/exim4/update-exim4.conf.conf
920
+    echo "dc_other_hostnames='${DEFAULT_DOMAIN_NAME};mail.${DEFAULT_DOMAIN_NAME}'" >> /etc/exim4/update-exim4.conf.conf
921
     echo "dc_local_interfaces=''" >> /etc/exim4/update-exim4.conf.conf
921
     echo "dc_local_interfaces=''" >> /etc/exim4/update-exim4.conf.conf
922
     echo "dc_readhost=''" >> /etc/exim4/update-exim4.conf.conf
922
     echo "dc_readhost=''" >> /etc/exim4/update-exim4.conf.conf
923
     echo "dc_relay_domains=''" >> /etc/exim4/update-exim4.conf.conf
923
     echo "dc_relay_domains=''" >> /etc/exim4/update-exim4.conf.conf