iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various updates
[distro-setup]
/
mail-setup
diff --git
a/mail-setup
b/mail-setup
index 4414c2a877c936756b8b3da3c8344bff92dbf737..f2623028be96c76a68bb4f869f7c9c7fe63c3353 100755
(executable)
--- a/
mail-setup
+++ b/
mail-setup
@@
-400,11
+400,10
@@
b=userforward_higher_priority
sed -r s/^\\S+:/$b:/ 600_exim4-config_userforward >175_$b
sed -r s/^\\S+:/$b:/ 600_exim4-config_userforward >175_$b
-
m rm -
f /etc/exim4/conf.d/main/000_localmacros # old filename
+
rm -v
f /etc/exim4/conf.d/main/000_localmacros # old filename
cat >/etc/exim4/conf.d/main/000_local <<EOF
MAIN_TLS_ENABLE = true
cat >/etc/exim4/conf.d/main/000_local <<EOF
MAIN_TLS_ENABLE = true
-
# debian exim config added this in 2016 or so?
# it's part of the smtp spec, to limit lines to 998 chars
# but a fair amount of legit mail does not adhere to it. I don't think
# debian exim config added this in 2016 or so?
# it's part of the smtp spec, to limit lines to 998 chars
# but a fair amount of legit mail does not adhere to it. I don't think
@@
-418,6
+417,11
@@
IGNORE_SMTP_LINE_LENGTH_LIMIT = true
# more verbose logs
MAIN_LOG_SELECTOR = +all
# more verbose logs
MAIN_LOG_SELECTOR = +all
+
+# normally empty, I set this so I can set the envelope address
+# when doing mail redelivery to invoke filters. Also allows
+# me exiqgrep and stuff.
+MAIN_TRUSTED_GROUPS = $u
EOF
rm -fv /etc/exim4/rcpt_local_acl # old path
EOF
rm -fv /etc/exim4/rcpt_local_acl # old path
@@
-687,8
+691,6
@@
EOF
# enable 587 in addition to the default 25, so that
# i can send mail where port 25 is firewalled by isp
daemon_smtp_ports = 25 : 587
# enable 587 in addition to the default 25, so that
# i can send mail where port 25 is firewalled by isp
daemon_smtp_ports = 25 : 587
-# i don't have ipv6 setup properly yet
-disable_ipv6 = true
DKIM_CANON = relaxed
DKIM_SELECTOR = li
DKIM_CANON = relaxed
DKIM_SELECTOR = li
@@
-713,10
+715,6
@@
DKIM_PRIVATE_KEY= \${if exists{/etc/exim4/\${dkim_domain}-private.pem} {/etc/exi
# Seems logical for this to be the same as mailname.
MAIN_HARDCODE_PRIMARY_HOSTNAME = mail.iankelling.org
# Seems logical for this to be the same as mailname.
MAIN_HARDCODE_PRIMARY_HOSTNAME = mail.iankelling.org
-# normally empty, I set this so I can set the envelope address
-# when doing mail redelivery to invoke filters
-MAIN_TRUSTED_GROUPS = $u
-
LOCAL_DELIVERY = dovecot_lmtp
# options exim has to avoid having to alter the default config files
LOCAL_DELIVERY = dovecot_lmtp
# options exim has to avoid having to alter the default config files