projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add l10n
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
d508eb0
..
d43cb86
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-194,8
+194,8
@@
queue_only_load = 35
smtp_load_reserve = 20
<%- else -%>
queue_run_max = 5
smtp_load_reserve = 20
<%- else -%>
queue_run_max = 5
-deliver_queue_load_max =
10
-queue_only_load =
5
+deliver_queue_load_max =
<%= [scope.lookupvar('::processorcount').to_i,2].max * 5 %>
+queue_only_load =
<%= [scope.lookupvar('::processorcount').to_i,2].max * 4 %>
<%- end -%>
queue_list_requires_admin = false
<%- end -%>
queue_list_requires_admin = false
@@
-1360,14
+1360,13
@@
rt_otherwise:
driver = redirect
domains = rt.debian.org
require_files = /usr/bin/rt-mailgate : RT_QUEUE_MAP
driver = redirect
domains = rt.debian.org
require_files = /usr/bin/rt-mailgate : RT_QUEUE_MAP
- local_parts = ${lookup{${sg{$local_part}{-
comment
}{}}}lsearch{RT_QUEUE_MAP}{$local_part}{}}
+ local_parts = ${lookup{${sg{$local_part}{-
(comment|done)
}{}}}lsearch{RT_QUEUE_MAP}{$local_part}{}}
local_part_suffix = +*
local_part_suffix_optional
pipe_transport = rt_pipe
local_part_suffix = +*
local_part_suffix_optional
pipe_transport = rt_pipe
- data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-
comment}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --extension ticket --action ${if match{$local_part}{.*-comment.*}{comment}{correspond
}}"
+ data = "|/usr/bin/rt-mailgate --queue '${lookup{${sg{$local_part}{-
(comment|done)}{}}}lsearch{RT_QUEUE_MAP}}' --url https://rt.debian.org/ --extension ticket --action ${if match{$local_part}{.*-comment.*}{comment}{${if match{$local_part}{.*-done.*}{correspond-resolve}{correspond}}
}}"
headers_remove = Subject
headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nSubject: ${if and {{first_delivery}{match {$h_subject:}{(?i)(.*?)\\\\[?debian rt\\\\]?[:\\s]*(.*)}}} {$1$2}{$h_subject:}}"
headers_remove = Subject
headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nSubject: ${if and {{first_delivery}{match {$h_subject:}{(?i)(.*?)\\\\[?debian rt\\\\]?[:\\s]*(.*)}}} {$1$2}{$h_subject:}}"
-
<%- end -%>
# exim4 fails the router if it can't change to the user/group for delivery
<%- end -%>
# exim4 fails the router if it can't change to the user/group for delivery