Routine update.

diff --git a/conf.d/main/01_exim4-config_listmacrosdefs b/conf.d/main/01_exim4-config_listmacrosdefs
index 0c772bd..4b421e5 100644 (file)
--- a/conf.d/main/01_exim4-config_listmacrosdefs
+++ b/conf.d/main/01_exim4-config_listmacrosdefs
@@ -66,7 +66,7 @@ DC_visiblename=DEBCONFvisiblenameDEBCONF
 # hcoop-change: List of domains that accept mail from local users.
 # Mail sent to other domains we manage will be transformed into a
 # local address by /etc/aliases.
-domainlist unix_domains = deleuze.hcoop.net:mire.hcoop.net:localhost
+domainlist unix_domains = hcoop.net:deleuze.hcoop.net:mire.hcoop.net:outpost.hcoop.net:localhost
 
 # List of sender networks (IP addresses) to _unconditionally_ relay
 # _for_. If you intend to be SMTP AUTH server, you do not need to enter

diff --git a/conf.d/main/02_exim4-config_options b/conf.d/main/02_exim4-config_options
index e28e3e6..203d837 100644 (file)
--- a/conf.d/main/02_exim4-config_options
+++ b/conf.d/main/02_exim4-config_options
@@ -182,3 +182,13 @@ trusted_groups = MAIN_TRUSTED_GROUPS
 # SMTP Banner. The example includes the Debian version in the SMTP dialog
 # MAIN_SMTP_BANNER = "${primary_hostname} ESMTP Exim ${version_number} (Debian package DEBCONFpackageversionDEBCONF) ${tod_full}"
 # smtp_banner = $smtp_active_hostname ESMTP Exim $version_number $tod_full
+
+
+# hcoop-change: raise limit for incoming SMTP connections
+smtp_accept_max = 45
+
+# hcoop-change: expire retry data after a single day
+retry_data_expire = 1d
+
+# hcoop-change: don't penalize hosts past 4 hours
+retry_interval_max = 4h

diff --git a/conf.d/retry/30_exim4-config b/conf.d/retry/30_exim4-config
index 87a6d5d..4247a05 100644 (file)
--- a/conf.d/retry/30_exim4-config
+++ b/conf.d/retry/30_exim4-config
@@ -12,8 +12,17 @@
 # effective retry-time depends on the frequenzy of queue-running, too.
 # See QUEUEINTERVAL in /etc/default/exim4.
 
+# hcoop-change: Customize all of this to not penalize local users so
+# much for timeouts.
+
 # Address or Domain    Error       Retries
 # -----------------    -----       -------
 
-*                      *           F,2h,15m; G,16h,1h,1.5; F,4d,6h
-
+# Local users who might have temporary AFS-related issues
+localhost              *           F,4d,1m
+hcoop.net              *           F,4d,1m
+# Deal with greylisting
+megacz.com             *           F,4d,3m
+yahoo.com              *           F,4d,3m
+# Defaults
+*                      *           F,4h,10m; G,16h,1h,1.5; F,4d,6h

diff --git a/conf.d/router/050_temporary_workarounds b/conf.d/router/050_temporary_workarounds
new file mode 100644 (file)
index 0000000..e329166
--- /dev/null
+++ b/conf.d/router/050_temporary_workarounds
@@ -0,0 +1,12 @@
+
+# hcoop-change: Deal with users who are causing trouble to the mail
+# system.
+
+# trouble_users_router:
+#   debug_print = "R: trouble_users for $local_part@$domain"
+#   driver = accept
+#   domains = +unix_domains
+#   condition = "${if eq {$local_part}{omry} {1}{0}}"
+#   local_part_prefix = real-
+#   check_local_user
+#   transport = trouble_users

diff --git a/conf.d/router/600_exim4-config_userforward b/conf.d/router/600_exim4-config_userforward
index dab56a4..f8d1d3c 100644 (file)
--- a/conf.d/router/600_exim4-config_userforward
+++ b/conf.d/router/600_exim4-config_userforward
@@ -19,14 +19,17 @@
 # forwarding generates a direct delivery to a directory, or a file, or to a
 # pipe, or sets up an auto-reply, respectively.
 
-# hcoop-change: Use unix_domains rather than local_domains.  Also, use
-# .public/.forward rather than .forward.
+# hcoop-change: Use unix_domains rather than local_domains.  Use
+# .public/.forward rather than .forward.  Do not verify the owner and
+# group of the .forward file.
 
 userforward:
   debug_print = "R: userforward for $local_part@$domain"
   driver = redirect
   domains = +unix_domains
   check_local_user
+  check_owner = false
+  check_group = false
   file = $home/.public/.forward
   require_files = $local_part:$home/.public/.forward
   no_verify

diff --git a/conf.d/transport/20_exim4-config_spamcheck b/conf.d/transport/20_exim4-config_spamcheck
index c44f0a4..910c8bd 100644 (file)
--- a/conf.d/transport/20_exim4-config_spamcheck
+++ b/conf.d/transport/20_exim4-config_spamcheck
@@ -7,12 +7,17 @@ spamcheck:
   driver = pipe
   command = /usr/sbin/exim4 -oMr spam-scanned -bS
   use_bsmtp
-  transport_filter = /usr/bin/spamc
+  transport_filter = /usr/bin/spamc -x
   home_directory = "/tmp/exim4"
   current_directory = "/tmp/exim4"
   user = Debian-exim
   group = Debian-exim
-  return_fail_output
+  return_fail_output = true
+  return_path_add = false
+  log_fail_output = true
+  temp_errors = *
+  timeout = 5m
+  timeout_defer = true
   message_prefix =
   message_suffix =
   headers_remove = X-Spam-Flag:X-Spam-Status:X-Spam-Level

diff --git a/conf.d/transport/30_exim4-config_maildir_home b/conf.d/transport/30_exim4-config_maildir_home
index f94b209..594cc0e 100644 (file)
--- a/conf.d/transport/30_exim4-config_maildir_home
+++ b/conf.d/transport/30_exim4-config_maildir_home
@@ -45,3 +45,5 @@ maildir_home:
   #
   # hcoop-change: uncommented this
   current_directory = /
+  # hcoop-change: Try 20 times rather than 10 before deferring.
+  maildir_retries = 20

diff --git a/conf.d/transport/30_exim4-config_trouble_users b/conf.d/transport/30_exim4-config_trouble_users
new file mode 100644 (file)
index 0000000..2a9fe1b
--- /dev/null
+++ b/conf.d/transport/30_exim4-config_trouble_users
@@ -0,0 +1,14 @@
+
+# This transport is used for handling deliveries directly to files that are
+# generated by aliasing or forwarding.
+#
+# hcoop-change: Add bogus group line to make sure get-token gets executed
+trouble_users:
+  debug_print = "T: trouble_users for $local_part@$domain"
+  driver = appendfile
+  group = mail
+  file = /var/tmp/frozen/${local_part}
+  delivery_date_add
+  envelope_to_add
+  return_path_add
+