X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mail-setup;h=abe98d97b61762b9f92339fc7bce1734baf29b0e;hb=9d21aed0c95e0c343f2769a724d9dbb220874185;hp=c062362c18b70409db760268fc74a0ef40ea167b;hpb=c8f87d4173949b8d96c9c34e2d2c0730caeba0eb;p=distro-setup

diff --git a/mail-setup b/mail-setup
index c062362..abe98d9 100755
--- a/mail-setup
+++ b/mail-setup
@@ -50,6 +50,8 @@ EOF
 # hamburger -> preferences -> preferences -> advanced tab -> config editor button -> security.ssl.enable_ocsp_must_staple = false
 # background: ovecot does not yet have ocsp stapling support
 # reference: https://community.letsencrypt.org/t/simple-guide-using-lets-encrypt-ssl-certs-with-dovecot/2921
+#
+# for phone, same thing but username alerts, pass in ivy-pass.
 #######
 
 
@@ -64,12 +66,13 @@ EOF
 # apg -m 50 -x 70 -n 1 -a 1 -M CLN >$f
 # s sed -i "/^$user:/d" /p/c/filesystem/etc/exim4/passwd
 # echo "$user:$(mkpasswd -m sha-512 -s <$f)" >>/p/c/filesystem/etc/exim4/passwd
+# # todo: port is no longer used in mailpass, remove it.
 # echo "mail.iankelling.org 587 $user:$(<$f)" >> /p/c/machine_specific/$user/filesystem/etc/mailpass
 # # then run this script, or part of it which uses /etc/mailpass
 
 # # dovecot password, i just need 1 as I\'m the only user
 # mkdir /p/c/filesystem/etc/dovecot
-# echo "iank:$(doveadm pw -s ssha256)::::::" >/p/c/filesystem/etc/dovecot/users
+# echo "iank:$(doveadm pw -s ssha256)::::::" >>/p/c/filesystem/etc/dovecot/users
 # conflink
 
 
@@ -177,15 +180,9 @@ EOF
 #exim4 -bt iank@localhost
 
 
-postconfin() {
-  local MAPFILE
-  mapfile -t
-  local s
-  postconf -ev "${MAPFILE[@]}"
-}
 e() { printf "%s\n" "$*"; }
 pi() { # package install
-  local s f
+  local f
   if dpkg -s -- "$@" &> /dev/null; then
     return 0;
   fi;
@@ -197,7 +194,7 @@ pi() { # package install
   apt-get -y install --purge --auto-remove "$@"
 }
 
-postmaster=$u
+postmaster=alerts
 mxhost=mail.iankelling.org
 mxport=587
 forward=$u@$mxhost
@@ -218,11 +215,11 @@ fi
 if [[ $HOSTNAME == $MAIL_HOST ]]; then
   # afaik, these will get ignored because they are routing to my own
   # machine, but rm them is safer
-  rm -f $(eval echo ~$postmaster)/.forward /root/.forward
+  rm -f $(eval echo ~$u)/.forward /root/.forward
 else
   # this can\'t be a symlink and has permission restrictions
   # it might work in /etc/aliases, but this seems more proper.
-  install -m 644 {-o,-g}$postmaster <(e $forward) $(eval echo ~$postmaster)/.forward
+  install -m 644 {-o,-g}$u <(e $forward) $(eval echo ~$u)/.forward
 fi
 
 
@@ -245,27 +242,6 @@ if [[ -e /p/c/filesystem ]]; then
   fi
 fi
 
-cat >/etc/systemd/system/offlineimapsync.timer <<'EOF'
-[Unit]
-Description=Run offlineimap-sync once every min
-
-[Timer]
-OnCalendar=*:0/1
-
-[Install]
-WantedBy=timers.target
-EOF
-
-cat >/etc/systemd/system/offlineimapsync.service <<EOF
-[Unit]
-Description=Offlineimap sync
-After=multi-user.target
-
-[Service]
-User=$u
-Type=oneshot
-ExecStart=/a/bin/log-quiet/sysd-mail-once offlineimap-sync /a/bin/distro-setup/offlineimap-sync
-EOF
 
 cat >/etc/systemd/system/mailclean.timer <<'EOF'
 [Unit]
@@ -291,36 +267,8 @@ EOF
 
 systemctl daemon-reload
 
-# wording of question from dpkg-reconfigure exim4-config
-# 1. internet site; mail is sent and received directly using SMTP
-# 2. mail sent by smarthost; received via SMTP or fetchmail
-# 3. mail sent by smarthost; no local mail
-# 4. local delivery only; not on a network
-# 5. no configuration at this time
-#
-# Note, I have used option 2 in the past for receiving mail
-# from lan hosts, sending external mail via another smtp server.
-#
-# Note, other than configtype, we could set all the options in
-# both types of configs without harm, they would either be
-# ignored or be disabled by other settings, but the default
-# local_interfaces definitely makes things more secure.
-
-# most of these settings get translated into settings
-# in /etc/exim4/update-exim4.conf.conf
-# how /etc/exim4/update-exim4.conf.conf translates into actual exim settings is
-# documented in man update-exim4.conf, which outputs to the config that
-# exim actually reads. except the man page is not perfect, for example,
-# it doesn't document that it sets
-# DCconfig_${dc_eximconfig_configtype}" "1"
-# which is a line from update-exim4.conf, which is a relatively short bash script.
-# mailname setting sets /etc/mailname
-
-debconf-set-selections <<EOF
-exim4-config exim4/use_split_config boolean true
-EOF
 
-source /a/bin/bash_unpublished/source-semi-priv
+source /a/bin/bash_unpublished/source-state
 mkdir -p /etc/exim4/conf.d/{main,transport,auth,router}
 
 cat >/etc/exim4/rcpt_local_acl <<'EOF'
@@ -417,7 +365,7 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 
-f=/a/bin/bash_unpublished/source-semi-priv
+f=/a/bin/bash_unpublished/source-state
 if [[ -e $f ]]; then
     source $f
 fi
@@ -470,120 +418,69 @@ systemctl enable mailcert.timer
 
 ##### end mailcert setup #####
 
+# comon stuff
+cat >/etc/exim4/update-exim4.conf.conf  <<'EOF'
+# default stuff, i havent checked if its needed
+dc_minimaldns='false'
+dc_relay_nets=''
+CFILEMODE='644'
+dc_use_split_config='true'
+dc_local_interfaces=''
+dc_mailname_in_oh='true'
+EOF
 
 
 if [[ $HOSTNAME == $MAIL_HOST ]]; then
 
-  debconf-set-selections <<EOF
-# Mail Server configuration
-# -------------------------
-
-# Please select the mail server configuration type that best meets your needs.
-
-# Systems with dynamic IP addresses, including dialup systems, should generally be
-# configured to send outgoing mail to another machine, called a 'smarthost' for
-# delivery because many receiving systems on the Internet block incoming mail from
-# dynamic IP addresses as spam protection.
-
-# A system with a dynamic IP address can receive its own mail, or local delivery can be
-# disabled entirely (except mail for root and postmaster).
-
-#   1. internet site; mail is sent and received directly using SMTP
-#   2. mail sent by smarthost; received via SMTP or fetchmail
-#   3. mail sent by smarthost; no local mail
-#   4. local delivery only; not on a network
-#   5. no configuration at this time
-
-# General type of mail configuration: 1
-exim4-config exim4/dc_eximconfig_configtype select internet site; mail is sent and received directly using SMTP
-
-
-
-# The 'mail name' is the domain name used to 'qualify' mail addresses without a domain
-# name.
-
-# This name will also be used by other programs. It should be the single, fully
-# qualified domain name (FQDN).
-
-# Thus, if a mail address on the local host is foo@example.org, the correct value for
-# this option would be example.org.
-
-# This name won\'t appear on From: lines of outgoing messages if rewriting is enabled.
-
-# System mail name:
-# iank: see comment elsewhere on mailname
-exim4-config exim4/mailname string mail.iankelling.org
-
+  # mail.iankelling.org so local imap clients can connect with tls and
+  # when they happen to not be local.
+  sed -ri -f - /etc/hosts <<'EOF'
+/^127\.0\.1\.1.* mail\.iankelling\.org\b/q
+/^127\.0\.1\.1 /s/ *$/ mail.iankelling.org/
+EOF
+  /a/exe/cedit mail /etc/dnsmasq-servers.conf <<'EOF' || [[ $? == 1 ]]
+server=/mail.iankelling.org/127.0.1.1
+EOF
+  systemctl reload dnsmasq
 
+  # I used to use debconf-set-selections + dpkg-reconfigure,
+  # which then updates this file
+  # but the process is slower than updating it directly and then I want to set other things in
+  # update-exim4.conf.conf, so there's no point.
+  # The file is documented in man update-exim4.conf,
+  # except the man page is not perfect, read the bash script to be sure about things.
 
+  # The debconf questions output is additional documentation that is not
+  # easily accessible, but super long, along with the initial default comment in this
+  # file, so I've saved that into ./mail-notes.conf.
 
-# Please enter a semicolon-separated list of recipient domains for which this machine
-# should consider itself the final destination. These domains are commonly called
-# 'local domains'. The local hostname (kd.lan) and 'localhost' are always added
-# to the list given here.
+  cat >>/etc/exim4/update-exim4.conf.conf <<EOF
+# note: some things we don't set that are here by default because they are unused.
 
-# By default all local domains will be treated identically. If both a.example and
-# b.example are local domains, acc@a.example and acc@b.example will be delivered to the
-# same final destination. If different domain names should be treated differently, it
-# is necessary to edit the config files afterwards.
+dc_eximconfig_configtype='internet'
 
-# Other destinations for which mail is accepted:
+# man page: is used to build the local_domains list, together with “localhost”
 # iank.bid is for testing
 # mail.iankelling.org is for machines i own
-exim4-config exim4/dc_other_hostnames string *.iankelling.org;iankelling.org;*iank.bid;iank.bid;*zroe.org;zroe.org;*.b8.nz;b8.nz
-
-
-
-
-# Please enter a semicolon-separated list of IP addresses. The Exim SMTP listener
-# daemon will listen on all IP addresses listed here.
-
-# An empty value will cause Exim to listen for connections on all available network
-# interfaces.
-
-# If this system only receives mail directly from local services (and not from other
-# hosts), it is suggested to prohibit external connections to the local Exim daemon.
-# Such services include e-mail programs (MUAs) which talk to localhost only as well as
-# fetchmail. External connections are impossible when 127.0.0.1 is entered here, as
-# this will disable listening on public network interfaces.
-
-# IP-addresses to listen on for incoming SMTP connections:
-exim4-config exim4/dc_local_interfaces	string
-
-
-
-
-# Mail for the 'postmaster', 'root', and other system accounts needs to be redirected
-# to the user account of the actual system administrator.
+dc_other_hostnames='*.iankelling.org;iankelling.org;*iank.bid;iank.bid;*zroe.org;zroe.org;*.b8.nz;b8.nz'
 
-# If this value is left empty, such mail will be saved in /var/mail/mail, which is not
-# recommended.
-
-# Note that postmaster\'s mail should be read on the system to which it is directed,
-# rather than being forwarded elsewhere, so (at least one of) the users listed here
-# should not redirect their mail off this machine. A 'real-' prefix can be used to
-# force local delivery.
-
-# Multiple user names need to be separated by spaces.
-
-# Root and postmaster mail recipient:
-exim4-config exim4/dc_postmaster string $postmaster
-
-
-
-# Exim is able to store locally delivered email in different formats. The most commonly
-# used ones are mbox and Maildir. mbox uses a single file for the complete mail folder
-# stored in /var/mail/. With Maildir format every single message is stored in a
-# separate file in ~/Maildir/.
+# from man page:
+# Is  a  list  of  domains for which we accept mail from anywhere on the Internet but which are not delivered locally, e.g.
+# because this machine serves as secondary MX for these domains. Sets MAIN_RELAY_TO_DOMAINS.
+# todo: we should not accept from anywhere, only the mx for fsf.
+dc_relay_domains='*.fsf.org;fsf.org'
+EOF
 
-# Please note that most mail tools in Debian expect the local delivery method to be
-# mbox in their default.
 
-#   1. mbox format in /var/mail/  2. Maildir format in home directory
+  # the debconf output about mailname is as follows:
+  # The 'mail name' is the domain name used to 'qualify' mail addresses without a domain
+  # name.
+  # This name will also be used by other programs. It should be the single, fully
+  # qualified domain name (FQDN).
+  # Thus, if a mail address on the local host is foo@example.org, the correct value for
+  # this option would be example.org.
+  # This name won\'t appear on From: lines of outgoing messages if rewriting is enabled.
 
-# Delivery method for local mail: 2
-exim4-config exim4/dc_localdelivery select Maildir format in home directory
-EOF
   echo mail.iankelling.org > /etc/mailname
 
   # MAIN_HARDCODE_PRIMARY_HOSTNAME might mess up the
@@ -676,10 +573,10 @@ EOF
   # sieve option, we wouldn\'t need this, but I\'d rather not modify a
   # default config if not needed. This won\'t work as a symlink in /a/c
   # unfortunately.
-  sudo -u $postmaster /a/exe/lnf -T sieve/main.sieve $(eval echo ~$postmaster)/.dovecot.sieve
+  sudo -u $u /a/exe/lnf -T sieve/main.sieve $(eval echo ~$u)/.dovecot.sieve
 
+  # we set this later in local.conf
   sed -ri -f - /etc/dovecot/conf.d/10-mail.conf <<'EOF'
-1i mail_location = maildir:/m/md:LAYOUT=fs:INBOX=/m/md/INBOX
 /^\s*mail_location\s*=/d
 EOF
 
@@ -733,11 +630,16 @@ ssl_cert = </etc/exim4/exim.crt
 ssl_key = </etc/exim4/exim.key
 # https://github.com/certbot/certbot/raw/master/certbot-apache/certbot_apache/options-ssl-apache.conf
 # in my cert cronjob, I check if that has changed upstream.
-ssl_cipher_list = ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
+ssl_cipher_list = ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
 
 # ian: added this, more secure, per google etc
 ssl_prefer_server_ciphers = yes
 
+
+mail_location = maildir:/m/%u:LAYOUT=fs:INBOX=/m/%u/INBOX
+mail_uid = iank
+mail_gid = iank
+
 # for debugging info, uncomment these.
 # logs go to syslog and to /var/log/mail.log
 # auth_verbose=yes
@@ -759,8 +661,6 @@ RestartSec=1
 StartLimitInterval=0
 EOF
 
-  systemctl enable offlineimapsync.timer
-  systemctl start offlineimapsync.timer
   systemctl enable mailclean.timer
   systemctl start mailclean.timer
   systemctl restart $vpn_ser@mail
@@ -769,8 +669,15 @@ EOF
   systemctl restart dovecot
 
 else # $HOSTNAME != $MAIL_HOST
-  systemctl disable offlineimapsync.timer &>/dev/null ||:
-  systemctl stop offlineimapsync.timer &>/dev/null ||:
+  # remove mail. 2 lines to properly remove whitespace
+  sed -ri -f - /etc/hosts <<'EOF'
+s#^(127\.0\.1\.1 .*) +mail\.iankelling\.org$#\1#
+s#^(127\.0\.1\.1 .*)mail\.iankelling\.org +(.*)#\1\2#
+EOF
+
+  echo | /a/exe/cedit mail /etc/dnsmasq-servers.conf || [[ $? == 1 ]]
+  systemctl reload dnsmasq
+
   systemctl disable mailclean.timer &>/dev/null ||:
   systemctl stop mailclean.timer &>/dev/null ||:
   systemctl disable $vpn_ser@mail
@@ -782,27 +689,20 @@ else # $HOSTNAME != $MAIL_HOST
   # would only exist because I wrote it i the previous condition,
   # it\'s not part of exim
   rm -f /etc/exim4/conf.d/main/000_localmacros
-  debconf-set-selections <<EOF
-exim4-config exim4/dc_eximconfig_configtype select mail sent by smarthost; no local mail
-exim4-config exim4/dc_smarthost string $smarthost
-# afaik, on dpkg-reconfigure noninteractive, this sets /etc/mailname if it does not exist.
-# if it does exist, it immediately changes the value to whats in /etc/mailname.
-# So, I don't think there's any point in setting it, but might as well since
-# ignoring what I set here is brain dead and might change.
-exim4-config exim4/mailname string $(hostname -f)
+  cat >>/etc/exim4/update-exim4.conf.conf <<EOF
+dc_eximconfig_configtype='satellite'
+dc_smarthost='$smarthost'
+dc_readhost='$(hostname -f)'
+# i dunno if this would ever get used.
+dc_localdelivery='maildir_home'
+dc_hide_mailname=''
 EOF
+
   hostname -f > /etc/mailname
 
 fi # end $HOSTNAME != $MAIL_HOST
 
-# if we already have it installed, need to reconfigure, without being prompted
-if dpkg -s exim4-config &>/dev/null; then
-  # gotta remove this, otherwise the set-selections are completely
-  # ignored. It woulda been nice if this was documented somewhere!
-  rm -f /etc/exim4/update-exim4.conf.conf
-  while fuser /var/lib/dpkg/lock &>/dev/null; do sleep 1; done
-  dpkg-reconfigure -u -fnoninteractive exim4-config
-fi
+systemctl reload exim4
 
 # i have the spool directory be common to distro multi-boot, so
 # we need the uid to be the same. 608 cuz it's kind of in the middle
@@ -885,10 +785,10 @@ sed -r s/^\\S+:/$b:/ 600_exim4-config_userforward >175_$b
 f=/etc/exim4/passwd.client
 rm -f /etc/exim4/passwd.client
 install -m 640 -g Debian-exim /dev/null $f
-cat /etc/mailpass| while read -r domain port pass; do
+while read -r domain _ pass; do
   # reference: exim4_passwd_client(5)
   printf "%s:%s\n" "$domain" "$pass" >>$f
-done
+done </etc/mailpass
 # end setup passwd.client
 
 # by default, only 10 days of logs are kept. increase that.
@@ -896,12 +796,27 @@ sed -ri 's/^(\s*rotate\s).*/\11000/' /etc/logrotate.d/exim4-base
 
 systemctl restart exim4
 
-# /etc/alias setup is debian specific, and
-# exim config sets up an /etc/alias from root to the postmaster, which i
-# config to ian, as long as there exists an entry for root, or there was
-# no preexisting aliases file. based on the postinst file. postfix
-# won\'t set up a root to $postmaster alias if it\'s already installed.
-# Since postfix is not the greatest, just set it ourselves.
+
+
+# /etc/alias setup is debian specific, and exim postinst script sets up
+# an /etc/alias from root to the postmaster, based on the question
+# exim4-config exim4/dc_postmaster, as long as there exists an entry for
+# root, or there was no preexisting aliases file. postfix won\'t set up
+# a root to $postmaster alias if it\'s already installed. Easiest to
+# just set it ourselves.
+
+# debconf question for postmaster:
+# Mail for the 'postmaster', 'root', and other system accounts needs to be redirected
+# to the user account of the actual system administrator.
+# If this value is left empty, such mail will be saved in /var/mail/mail, which is not
+# recommended.
+# Note that postmaster\'s mail should be read on the system to which it is directed,
+# rather than being forwarded elsewhere, so (at least one of) the users listed here
+# should not redirect their mail off this machine. A 'real-' prefix can be used to
+# force local delivery.
+# Multiple user names need to be separated by spaces.
+# Root and postmaster mail recipient:
+
 if [[ $postmaster != root ]]; then
   sed -i --follow-symlinks -f - /etc/aliases <<EOF
 \$a root: $postmaster
@@ -918,17 +833,45 @@ fi
 dir=/nocow/exim4
 sdir=/var/spool/exim4
 # we only do this if our system has $dir
-if [[ -e /nocow && $(readlink -f $sdir) != $dir ]]; then
-  systemctl stop exim4
-  if [[ ! -e $dir && -d $sdir ]]; then
-    mv $sdir $dir
+
+# this used to do a symlink, but, in the boot logs, /nocow would get mounted succesfully,
+# about 2 seconds later, exim starts, and immediately puts into paniclog:
+# honVi-0000u3-82 Failed to create directory "/var/spool/exim4/input": No such file or directory
+# so, im trying a bind mount to get rid of that.
+if [[ -e /nocow ]]; then
+  if ! grep -Fx "/nocow/exim4  /var/spool/exim4  none  bind  0 0" /etc/fstab; then
+    echo "/nocow/exim4  /var/spool/exim4  none  bind  0 0" >> /etc/fstab
+  fi
+  if ! mountpoint -q $sdir; then
+    systemctl stop exim4
+    if [[ -L $sdir ]]; then
+      rm $sdir
+    fi
+    if [[ ! -e $dir && -d $sdir ]]; then
+      mv $sdir $dir
+    fi
+    if [[ ! -d $sdir ]]; then
+      mkdir $sdir
+      chmod 000 $sdir # only want it to be used when its mounted
+    fi
+    mount $sdir
   fi
-  /a/exe/lnf -T $dir $sdir
 fi
 
 systemctl restart exim4
 systemctl enable exim4
 
+
+if [[ $HOSTNAME == $MAIL_HOST ]]; then
+  cat >/etc/cron.d/mailtest <<'EOF'
+*/10 * * * *   iank echo body_test | mail -s "primary_test $(date +%s) $(date +%Y-%m-%dT%H:%M:%S%z)" iank@posteo.de
+2/10 * * * *   root /usr/local/bin/mailtest-check
+EOF
+  cp /a/bin/distro-setup/filesystem/usr/local/bin/mailtest-check /usr/local/bin
+else
+  rm -f /etc/cron.d/mailtest
+fi
+
 # MAIL_HOST also does radicale, and easier to start and stop it here
 # for when MAIL_HOST changes, so radicale gets the synced files and
 # does not stop us from remounting /o.