Copyright year bumps for substantive changes 2017

[exim.git] / test / confs / 0001

diff --git a/test/confs/0001 b/test/confs/0001
index 14db5ae2696921340502c4a25eda4a991f655afc..b0f8f61e35097e456df33d9b90c1258500967571 100644 (file)
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -5,8 +5,8 @@
 # mess up the creation of the spool directory etc.
 
 exim_path = EXIM_PATH
 # mess up the creation of the spool directory etc.
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 host_lookup_order = bydns

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""


@@ -39,6 +39,7 @@ bounce_return_body = false
 no_bounce_return_message
 return_size_limit = 12K
 bounce_return_size_limit = 10K
 no_bounce_return_message
 return_size_limit = 12K
 bounce_return_size_limit = 10K

+bounce_return_linesize_limit = 997

 callout_domain_negative_expire = 1h
 callout_domain_positive_expire = 1d
 callout_negative_expire = 5h
 callout_domain_negative_expire = 1h
 callout_domain_positive_expire = 1d
 callout_negative_expire = 5h


@@ -147,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}}


@@ -192,18 +193,20 @@ 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
 tcp_nodelay = false
 timeout_frozen_after = 7d
 timezone = EDT
 system_filter_pipe_transport =
 system_filter_reply_transport =
 system_filter_user = 99
 tcp_nodelay = false
 timeout_frozen_after = 7d
 timezone = EDT

+tls_advertise_hosts =

 trusted_groups = 42
 trusted_users = ${readfile{DIR/aux-fixed/TESTNUM.trusted}{:}}
 unknown_login = unknownlogin
 trusted_groups = 42
 trusted_users = ${readfile{DIR/aux-fixed/TESTNUM.trusted}{:}}
 unknown_login = unknownlogin


@@ -234,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


@@ -368,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


@@ -384,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


@@ -418,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


@@ -458,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


@@ -517,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


@@ -528,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