iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mail backups were getting in a loop, i think this fixes
[distro-setup]
/
mail-setup
diff --git
a/mail-setup
b/mail-setup
index 0ec838413a7f00e806e6f7fbb49fbc7d9e5b5252..85bd17b78f6313541af26babbdde0a3d6f6eabb4 100755
(executable)
--- a/
mail-setup
+++ b/
mail-setup
@@
-1209,8
+1209,8
@@
REMOTE_SMTP_SMARTHOST_HOSTS_REQUIRE_TLS = *
# other says gmail does not reject. figure out and open a new bug.
IGNORE_SMTP_LINE_LENGTH_LIMIT = true
# other says gmail does not reject. figure out and open a new bug.
IGNORE_SMTP_LINE_LENGTH_LIMIT = true
-# more verbose logs
-MAIN_LOG_SELECTOR =
+all
+# more verbose logs
. used to use +all, but made it less for more efficiency.
+MAIN_LOG_SELECTOR =
-tls_cipher -tls_certificate_verified +pid +received_recipients +received_sender +sender_on_delivery +return_path_on_delivery +msg_id_created +subject +address_rewrite +smtp_confirmation
# Based on spec, seems like a good idea to be nice.
smtp_return_error_details = true
# Based on spec, seems like a good idea to be nice.
smtp_return_error_details = true
@@
-1355,7
+1355,9
@@
EOF
# old file
# old file
-rm -fv /etc/exim4/conf.d/router/8{8,9}0_backup_copy /etc/exim4/conf.d/router/865_backup_redir
+rm -fv /etc/exim4/conf.d/router/8{8,9}0_backup_copy \
+ /etc/exim4/conf.d/router/865_backup_redir \
+ /etc/exim4/conf.d/router/870_backup_local
# It is important for this to exist everywhere except in MAIL_HOST
# non-nn config. Previously, just had it in the nn-config on MAIL_HOST,
# It is important for this to exist everywhere except in MAIL_HOST
# non-nn config. Previously, just had it in the nn-config on MAIL_HOST,
@@
-2813,7
+2815,7
@@
case $HOSTNAME in
# ** $MAIL_HOST|bk|je)
$MAIL_HOST|bk|je)
# ** $MAIL_HOST|bk|je)
$MAIL_HOST|bk|je)
- echo|i /etc/exim4/conf.d/router/
870
_backup_local
+ echo|i /etc/exim4/conf.d/router/
165
_backup_local
cat >>/etc/exim4/update-exim4.conf.conf <<EOF
# note: some things we don't set that are here by default because they are unused.
cat >>/etc/exim4/update-exim4.conf.conf <<EOF
# note: some things we don't set that are here by default because they are unused.
@@
-2966,6
+2968,11
@@
deny
!authenticated = *
domains = +local_hostnames
message = no relay
!authenticated = *
domains = +local_hostnames
message = no relay
+
+# for testing bounce behavior
+#deny
+# senders = testlist-bounces+test=zroe.org@fsf.org
+# message = iank-bounce
EOF
echo|i /etc/exim4/conf.d/router/880_universal_forward
EOF
echo|i /etc/exim4/conf.d/router/880_universal_forward
@@
-3192,7
+3199,7
@@
backup_maildir:
mode_fail_narrower = false
EOF
mode_fail_narrower = false
EOF
- i /etc/exim4/conf.d/router/
870
_backup_local <<'EOF'
+ i /etc/exim4/conf.d/router/
165
_backup_local <<'EOF'
### router/900_exim4-config_local_user
#################################
### router/900_exim4-config_local_user
#################################