X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=6dd0a376c935b9289e036bcd9a88b9badb5e7625;hb=e152ea9072eba0cf0b3920c779e3fdb8ad3880fd;hp=a8b88ecf0d774c51e4db610e4a7eb0c526173b1f;hpb=26af31cd5a84c06d1c0797c20c99b8f03676a0ba;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index a8b88ecf0..6dd0a376c 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -214,7 +214,8 @@ delay_warning =
 <% if nodeinfo.has_key?('heavy_exim') and not nodeinfo['heavy_exim'].empty? %>
 queue_run_max = 50
 deliver_queue_load_max = 50
-queue_only_load = 15
+queue_only_load = 35
+smtp_load_reserve = 20
 <% else %>
 queue_run_max = 5
 deliver_queue_load_max = 10
@@ -528,7 +529,6 @@ out
   accept  domains  = +local_domains
           hosts    = +debianhosts
           endpass
-	  message  = unknown user
 	  verify   = recipient
 
 <%=
@@ -537,7 +537,6 @@ if nodeinfo['mailrelay']
   out = '
   accept  domains  = +mailhubdomains
           endpass
-	  message  = unknown user
 	  verify   = recipient/callout=30s,defer_ok,use_sender,no_cache
 '
 end
@@ -546,7 +545,6 @@ out
 
   accept  domains  = +submission_domains
           endpass
-	  message  = unknown user
 	  verify   = recipient
 
   deny    message = relay not permitted
@@ -903,7 +901,6 @@ if nodeinfo['mailrelay']
   out = '
   accept  domains  = +mailhubdomains
           endpass
-	  message  = unknown user
 	  verify   = recipient/callout=30s,defer_ok,use_sender,no_cache
 '
 end
@@ -911,7 +908,6 @@ out
 %>
   accept  domains  = +handled_domains
           endpass
-	  message  = unknown user
 	  verify   = recipient/defer_ok
 
   accept  hosts         = +debianhosts
@@ -1443,25 +1439,6 @@ end
 out
 %>
 
-virt_alias_verify:
-  debug_print = "R: virt_aliases for $local_part@$domain"
-  driver = redirect
-  data = ${if exists{\
-           ${extract{directory}{VDOMAINDATA}{${value}/aliases}}}\
-	   {${lookup{$local_part}lsearch*{\
-              ${extract{directory}{VDOMAINDATA}{$value/aliases}}\
-	   }}}}
-  directory_transport = address_directory
-  cannot_route_message = Unknown user
-  domains = +virtual_domains
-  file_transport = address_file
-  pipe_transport = address_pipe
-  qualify_preserve_domain
-  retry_use_local_part
-  transport_current_directory = ${extract{directory}{VDOMAINDATA}}
-  transport_home_directory = ${extract{directory}{VDOMAINDATA}}
-  verify_only
-
 virt_direct_verify:
   debug_print = "R: virt_direct for $local_part@$domain"
   driver = redirect
@@ -1504,7 +1481,6 @@ virt_aliases:
   retry_use_local_part
   transport_current_directory = ${extract{directory}{VDOMAINDATA}}
   transport_home_directory = ${extract{directory}{VDOMAINDATA}}
-  no_verify
   user = ${extract{user}{VDOMAINDATA}}
   
 # This is a qmailesque deliver into a directory of .forward files