X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/d203e649775fb5543a3871f3c0f7df6dd4ac8577..47bc7a521803eaea0d6666c327f2e21e22eb920b:/test/confs/4000?ds=sidebyside diff --git a/test/confs/4000 b/test/confs/4000 index daf5a687e..d80aaa8f1 100644 --- a/test/confs/4000 +++ b/test/confs/4000 @@ -1,53 +1,26 @@ # Exim test configuration 4000 -exim_path = EXIM_PATH -host_lookup_order = bydns +.include DIR/aux-var/std_conf_prefix + +log_selector = +subject 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 # ----- 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: +.ifdef BAD + deny message = this is a deny from the mime acl +.endif + warn decode = default add_header = X-$mime_part_count-content-type: $mime_content_type\n\ X-$mime_part_count-filename: $mime_filename\n\ @@ -62,10 +35,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 - warn mime_regex = (?s)\ - (?=Test quoted-printable =)\ - (?=.*?Continued line with this) - add_header = X-mime-regex: matched accept @@ -76,10 +45,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 ----- @@ -87,7 +52,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER