bug-fix test-driving input

[exim.git] / test / confs / 0001

diff --git a/test/confs/0001 b/test/confs/0001
index 0daf053bdd04824618722e4c87cc78c0cc3f27b1..b0f8f61e35097e456df33d9b90c1258500967571 100644 (file)
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -148,7 +148,7 @@ no_queue_only_override
 queue_only_file = /var/spool/exim/queue_only
 queue_only_load = 8.2
 no_queue_run_in_order
 queue_only_file = /var/spool/exim/queue_only
 queue_only_load = 8.2
 no_queue_run_in_order

-queue_run_max = 5
+queue_run_max = ${if = {1}{1} {5}{10}}

 queue_smtp_domains = x.y.z
 receive_timeout = 0s
 received_header_text = Received: ${if def:sender_rcvhost {from ${sender_rcvhost}\n\t}{${if def:sender_ident {from ${sender_ident} }}${if def:sender_helo_name {(helo=${sender_helo_name})\n\t}}}}by ${primary_hostname} ${if def:received_protocol {with ${received_protocol}}} (Exim ${version_number} #${compile_number})\n\tid ${message_id}${if def:received_for {\n\tfor $received_for}}
 queue_smtp_domains = x.y.z
 receive_timeout = 0s
 received_header_text = Received: ${if def:sender_rcvhost {from ${sender_rcvhost}\n\t}{${if def:sender_ident {from ${sender_ident} }}${if def:sender_helo_name {(helo=${sender_helo_name})\n\t}}}}by ${primary_hostname} ${if def:received_protocol {with ${received_protocol}}} (Exim ${version_number} #${compile_number})\n\tid ${message_id}${if def:received_for {\n\tfor $received_for}}


@@ -193,12 +193,13 @@ no_strip_excess_angle_brackets
 no_strip_trailing_dot
 no_syslog_duplication
 syslog_facility = uucp
 no_strip_trailing_dot
 no_syslog_duplication
 syslog_facility = uucp

+no_syslog_pid

 syslog_processname = mta-exim
 no_syslog_timestamp
 system_filter = /home/exim/test/filter
 system_filter_directory_transport =
 system_filter_file_transport =
 syslog_processname = mta-exim
 no_syslog_timestamp
 system_filter = /home/exim/test/filter
 system_filter_directory_transport =
 system_filter_file_transport =

-system_filter_group = mail
+system_filter_group = MAILGROUP

 system_filter_pipe_transport =
 system_filter_reply_transport =
 system_filter_user = 99
 system_filter_pipe_transport =
 system_filter_reply_transport =
 system_filter_user = 99


@@ -236,7 +237,7 @@ manualroute:
   no_fail_verify_recipient
   no_fail_verify_sender
   fallback_hosts = localhost
   no_fail_verify_recipient
   no_fail_verify_sender
   fallback_hosts = localhost

-  group = mail
+  group = MAILGROUP

   headers_add =
   headers_remove =
   host_find_failed = freeze
   headers_add =
   headers_remove =
   host_find_failed = freeze


@@ -370,7 +371,7 @@ forward:
   forbid_filter_run
   no_forbid_include
   no_forbid_pipe
   forbid_filter_run
   no_forbid_include
   no_forbid_pipe

-  group = mail
+  group = MAILGROUP

   headers_add =
   headers_remove =
   hide_child_in_errmsg
   headers_add =
   headers_remove =
   hide_child_in_errmsg


@@ -386,7 +387,7 @@ forward:
   more
   no_one_time
   owners = root
   more
   no_one_time
   owners = root

-  owngroups = mail
+  owngroups = MAILGROUP

   pipe_transport = dummy
   no_qualify_preserve_domain
   redirect_router = aliasfile2
   pipe_transport = dummy
   no_qualify_preserve_domain
   redirect_router = aliasfile2


@@ -420,7 +421,7 @@ localuser:
   no_fail_verify_recipient
   no_fail_verify_sender
   fallback_hosts =
   no_fail_verify_recipient
   no_fail_verify_sender
   fallback_hosts =

-  group = mail
+  group = MAILGROUP

   headers_add = X-added: by localuser
   headers_remove =
   no_initgroups
   headers_add = X-added: by localuser
   headers_remove =
   no_initgroups


@@ -460,7 +461,7 @@ smartuser:
   file_transport = dummy
   forbid_file
   forbid_pipe
   file_transport = dummy
   forbid_file
   forbid_pipe

-  group = mail
+  group = MAILGROUP

   headers_add =
   headers_remove =
   hide_child_in_errmsg
   headers_add =
   headers_remove =
   hide_child_in_errmsg


@@ -519,7 +520,7 @@ appendfile:
   file = /home/$local_part/inbox
   file_format = "From : appendfile"
   no_file_must_exist
   file = /home/$local_part/inbox
   file_format = "From : appendfile"
   no_file_must_exist

-  group = mail
+  group = MAILGROUP

   headers_add = X-original-domain: $original_domain\nX-original-localp: $original_local_part
   headers_remove =
   headers_rewrite = a@b c@d
   headers_add = X-original-domain: $original_domain\nX-original-localp: $original_local_part
   headers_remove =
   headers_rewrite = a@b c@d


@@ -530,7 +531,7 @@ appendfile:
   lockfile_timeout = 30m
   mailbox_size = 1000
   mailbox_filecount = 9999
   lockfile_timeout = 30m
   mailbox_size = 1000
   mailbox_filecount = 9999

-  message_size_limit = 1M
+  message_size_limit = 1G

   mode = 0600
   mode_fail_narrower
   no_notify_comsat
   mode = 0600
   mode_fail_narrower
   no_notify_comsat