merge hcoop retry timeout config

diff --git a/conf.d/retry/30_exim4-config b/conf.d/retry/30_exim4-config
index 87a6d5d..fef73a4 100644 (file)
--- a/conf.d/retry/30_exim4-config
+++ b/conf.d/retry/30_exim4-config
@@ -12,8 +12,18 @@
 # effective retry-time depends on the frequenzy of queue-running, too.
 # See QUEUEINTERVAL in /etc/default/exim4.
 
 # 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
 # -----------------    -----       -------
 
 # 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
+rosasharn.com          *           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