X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/71fafd9530395ba813bf8669340517a12700c769..b4b3528b6ffe0a1bd405893052f9ce0788e8d46b:/test/confs/4000?ds=inline diff --git a/test/confs/4000 b/test/confs/4000 index 1b33ff795..bc4ccd8fd 100644 --- a/test/confs/4000 +++ b/test/confs/4000 @@ -1,52 +1,27 @@ # Exim test configuration 4000 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex -rfc1413_query_timeout = 0s spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +log_selector = +subject +tls_advertise_hosts = # ----- Main settings ----- -acl_smtp_rcpt = check_rcpt -acl_smtp_data = check_data -acl_not_smtp = check_data +acl_smtp_rcpt = accept acl_smtp_mime = check_mime -acl_not_smtp_mime = check_mime - -av_scanner = clamd:CLAMSOCKET # ----- ACL ----- begin acl -check_rcpt: - accept - -check_data: - deny message = Found $malware_name - malware = * - - warn spam = nobody - - warn set acl_m0 = $spam_score_int - - warn message = X-Regex: Regex matched - regex = THIS REGEX - - warn condition = ${if !eq{$h_fakereject:}{}} - control = fakereject - - warn condition = ${if !eq{$h_fakedefer:}{}} - control = fakedefer - - accept - check_mime: warn decode = default add_header = X-$mime_part_count-content-type: $mime_content_type\n\ @@ -62,7 +37,6 @@ check_mime: X-$mime_part_count-is-rfc822: $mime_is_rfc822\n\ X-$mime_part_count-decode-filename: $mime_decoded_filename\n\ X-$mime_part_count-content-size: $mime_content_size - accept @@ -73,10 +47,6 @@ begin routers r1: driver = accept transport = t1 - headers_add = X-Router-SSint: \ - ${if eq {$spam_score_int}{$acl_m0}\ - {was preserved}{was not preserver}} - # ----- Transports -----