X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mail-setup;h=645510a14049d1c0ff8d61e313a1843b75426ed3;hb=6561b24248188e5bce423acab25c2c14c7e5ce6d;hp=b8440fbfc7fc3684678f851273128102a238cfe4;hpb=effc74a288ee7e4d0a83bbf3335ba10f95eb7b8a;p=distro-setup diff --git a/mail-setup b/mail-setup index b8440fb..645510a 100755 --- a/mail-setup +++ b/mail-setup @@ -1,7 +1,7 @@ #!/bin/bash set -x -# Copyright (C) 2016 Ian Kelling +# Copyright (C) 2019 Ian Kelling # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -66,6 +66,7 @@ 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 @@ -148,46 +149,10 @@ EOF ####### end persistent dkim instructions ######### -# misc exim notes: -# useful exim docs: -# /usr/share/doc/exim4-base/README.Debian.gz -# /usr/share/doc/exim4-base/spec.txt.gz -# routers, transports, and authenticators are sections, and you define -# driver instances in those sections, and the manual calls them driver -# types but there is also a more specific "type" of driver, which is specified -# with the driver = some_module setting in the driver. - -# the driver option must precede and private options (options that are -# specific to that driver), so follow example of putting it at beginning. - -# The full list of option settings for any particular driver instance, -# including all the defaulted values, can be extracted by making use of -# the -bP command line option. -# exim -bP config_file to see what config file it used -# exim -bP config to see - -# exim clear out message queue. as root: -# adapted from somewhere on stackoverflow. -# ser stop exim4; sleep 1; exim -bp | exiqgrep -i | xargs exim -Mrm; ser start exim4 - -# fastmail has changed their smtp server, but the old one still works, -# I see no reason to bother changing. -# New one is smtp.fastmail.com - -# test delivery & rewrite settings: -#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; @@ -217,7 +182,7 @@ if [[ ! -e /lib/systemd/system/openvpn-client@.service ]]; then vpn_ser=openvpn fi -if [[ $HOSTNAME == $MAIL_HOST ]]; then +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 ~$u)/.forward /root/.forward @@ -247,27 +212,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 </etc/systemd/system/mailclean.timer <<'EOF' [Unit] @@ -293,40 +237,12 @@ 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 </etc/exim4/rcpt_local_acl <<'EOF' -# Only hosts we control send to mail.iankelling.org, so make sure +# Only hosts we control send to @mail.iankelling.org, so make sure # they are all authed. # Note, if we wanted authed senders for all domains, # we could make this condition in acl_check_mail @@ -345,13 +261,18 @@ cat >/etc/exim4/data_local_acl <<'EOF' # suggested in official docs, and 100k in the wiki example because # those docs are rather old and I see a 110k spam message # pretty quickly looking through my spam folder. - warn - condition = ${if < {$message_size}{2000K}} - spam = Debian-exim:true - add_header = X-Spam_score: $spam_score\n\ - X-Spam_score_int: $spam_score_int\n\ - X-Spam_bar: $spam_bar\n\ - X-Spam_report: $spam_report +warn + condition = ${if < {$message_size}{2000K}} + spam = Debian-exim:true + add_header = X-Spam_score: $spam_score\n\ + X-Spam_score_int: $spam_score_int\n\ + X-Spam_bar: $spam_bar\n\ + X-Spam_report: $spam_report + +#accept +# spf = pass:fail:softfail:none:neutral:permerror:temperror +# dmarc_status = reject:quarantine +# add_header = Reply-to: dmarctest@iankelling.org EOF cat >/etc/exim4/conf.d/auth/29_exim4-config_auth <<'EOF' @@ -394,6 +315,11 @@ dovecot_lmtp: batch_max = 200 EOF +cat >/etc/exim4/host_local_deny_exceptions <<'EOF' +mail.fsf.org +*.posteo.de +EOF + cat >/etc/exim4/conf.d/router/190_exim4-config_fsfsmarthost <<'EOF' # smarthost for fsf mail # ian: copied from /etc/exim4/conf.d/router/200_exim4-config_primary, and added senders = and @@ -419,11 +345,11 @@ 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 -if [[ $HOSTNAME == $MAIL_HOST ]]; then +if [[ $HOSTNAME == "$MAIL_HOST" ]]; then local_mx=mail.iankelling.org rsync_common="rsync -ogtL --chown=root:Debian-exim --chmod=640 root@li.iankelling.org:/etc/letsencrypt/live/$local_mx/" ${rsync_common}fullchain.pem /etc/exim4/exim.crt @@ -472,14 +398,24 @@ 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 +if [[ $HOSTNAME == "$MAIL_HOST" ]]; then # 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.* mail\.iankelling\.org\b/{p;d} /^127\.0\.1\.1 /s/ *$/ mail.iankelling.org/ EOF /a/exe/cedit mail /etc/dnsmasq-servers.conf <<'EOF' || [[ $? == 1 ]] @@ -487,116 +423,44 @@ server=/mail.iankelling.org/127.0.1.1 EOF systemctl reload dnsmasq - debconf-set-selections <>/etc/exim4/update-exim4.conf.conf < /etc/mailname # MAIN_HARDCODE_PRIMARY_HOSTNAME might mess up the @@ -669,8 +533,25 @@ CHECK_DATA_VERIFY_HEADER_SENDER = true CHECK_RCPT_SPF = true CHECK_RCPT_REVERSE_DNS = true CHECK_MAIL_HELO_ISSUED = true + +MAIN_LOG_SELECTOR = +all + +# testing dmarc +#dmarc_tld_file = /etc/public_suffix_list.dat +EOF + + f=/etc/cron.daily/refresh-dmarc-tld-file + cat >$f <<'EOF' +#!/bin/bash +cd /etc +wget -nv -N https://publicsuffix.org/list/public_suffix_list.dat EOF + chmod 755 $f + sed -i --follow-symlinks -f - /etc/aliases </etc/dovecot/local.conf <<'EOF' + cat >/etc/dovecot/local.conf </dev/null ||: - systemctl stop offlineimapsync.timer &>/dev/null ||: systemctl disable mailclean.timer &>/dev/null ||: systemctl stop mailclean.timer &>/dev/null ||: systemctl disable $vpn_ser@mail @@ -809,27 +688,28 @@ EOF # 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 <>/etc/exim4/update-exim4.conf.conf < /etc/mailname + # We set this to alerts on MAIL_HOST, but using a user that doesn't exist elsewhere + # is no good. + sed -i --follow-symlinks -f - /etc/aliases </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 @@ -912,10 +792,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 $f <<'EOF' +#!/bin/bash +echo body_test | mail -s "primary_test $(date +%s) $(date +%Y-%m-%dT%H:%M:%S%z)" iank@posteo.de +EOF + chmod +x $f + + cat >/etc/cron.d/mailtest </dev/null; then - if [[ $HOSTNAME == $MAIL_HOST ]]; then + if [[ $HOSTNAME == "$MAIL_HOST" ]]; then systemctl restart radicale systemctl enable radicale if [[ -e /etc/logrotate.d/radicale.disabled ]]; then