X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=1be6b7e14a54beb2a74a5a4020456f56af5480d0;hb=ba7d7945f415e31e7b67659e745257cab106daa3;hp=f7a988491dfaa42f3e03fb5644974a03f8fd7214;hpb=cfebcc4b2d6c5fb2d02b7b6b005eeccdde19dd09;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index f7a988491..1be6b7e14 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -194,8 +194,13 @@ queue_only_load = 35
 smtp_load_reserve = 20
 <%- else -%>
 queue_run_max = 5
+<%- if scope.lookupvar('::processorcount').to_s != 'undefined' -%>
 deliver_queue_load_max = <%= [scope.lookupvar('::processorcount').to_i,2].max * 5 %>
 queue_only_load = <%= [scope.lookupvar('::processorcount').to_i,2].max * 4 %>
+<%- else -%>
+deliver_queue_load_max = 10
+queue_only_load = 8
+<%- end -%>
 <%- end -%>
 queue_list_requires_admin = false
 
@@ -613,10 +618,6 @@ check_recipient:
           hosts         = 65.110.39.147 : 64.39.31.15
           message       = <mendoza@kenny.linuxsis.net> cannot forward here while mailer-daemon mail is not caught
 
-  deny    recipients    = risko@debian.org
-	  senders       = :
-	  message       = please stop joe-jobbing this user now
-
   deny    condition     = ${lookup{$sender_address_local_part}lsearch{/etc/exim4/localusers}{true}}
 	  sender_domains= +local_domains
 	  hosts         = !+debianhosts