iankelling.org
/
git
/
distro-setup
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6cc7302
)
fix escaping issue
author
Ian Kelling
<ian@iankelling.org>
Wed, 27 Apr 2022 16:26:08 +0000
(12:26 -0400)
committer
Ian Kelling
<ian@iankelling.org>
Wed, 27 Apr 2022 16:26:39 +0000
(12:26 -0400)
mail-setup
patch
|
blob
|
history
diff --git
a/mail-setup
b/mail-setup
index 041ab1d58db145e8ea8a2d8af07a1d60eb4db073..6a291c444748eacd3dbafd6d1e4dcf202aa37cf3 100755
(executable)
--- a/
mail-setup
+++ b/
mail-setup
@@
-1162,17
+1162,17
@@
DKIM_SIGN_HEADERS = mime-version:in-reply-to:references:from:date:subject:to
domainlist local_hostnames = ! je.b8.nz : ! bk.b8.nz : *.b8.nz : b8.nz
domainlist local_hostnames = ! je.b8.nz : ! bk.b8.nz : *.b8.nz : b8.nz
-hostlist iank_trusted = <; \
\
+hostlist iank_trusted = <; \
# veth0
# veth0
-10.173.8.1 ; \
\
+10.173.8.1 ; \
# li li_ip6
# li li_ip6
-72.14.176.105 ; 2600:3c00::f03c:91ff:fe6d:baf8 ; \
\
+72.14.176.105 ; 2600:3c00::f03c:91ff:fe6d:baf8 ; \
# li_vpn_net li_vpn_net_ip6s
# li_vpn_net li_vpn_net_ip6s
-10.8.0.0/24; 2600:3c00:e000:280::/64 ; 2600:3c00:e002:3800::/56 ; \
\
+10.8.0.0/24; 2600:3c00:e000:280::/64 ; 2600:3c00:e002:3800::/56 ; \
# bk bk_ip6
# bk bk_ip6
-85.119.83.50 ; 2001:ba8:1f1:f0c9::2 ; \
\
+85.119.83.50 ; 2001:ba8:1f1:f0c9::2 ; \
# je je_ipv6
# je je_ipv6
-85.119.82.128 ; 2001:ba8:1f1:f09d::2 ; \
\
+85.119.82.128 ; 2001:ba8:1f1:f09d::2 ; \
# fsf_mit_net fsf_mit_net_ip6 fsf_net fsf_net_ip6 fsf_office_net
18.4.89.0/24 ; 2603:3005:71a:2e00::/64 ; 209.51.188.0/24 ; 2001:470:142::/48 ; 74.94.156.208/28
# fsf_mit_net fsf_mit_net_ip6 fsf_net fsf_net_ip6 fsf_office_net
18.4.89.0/24 ; 2603:3005:71a:2e00::/64 ; 209.51.188.0/24 ; 2001:470:142::/48 ; 74.94.156.208/28
@@
-1186,8
+1186,6
@@
delay_warning_condition = ${if or {\
{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }\
{ match_domain{$domain}{+local_domains} }\
} {no}{yes}}
{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }\
{ match_domain{$domain}{+local_domains} }\
} {no}{yes}}
-
-
EOF
rm -fv /etc/exim4/rcpt_local_acl # old path
EOF
rm -fv /etc/exim4/rcpt_local_acl # old path