Merge branch '4.next'

[users/jgh/exim.git] / test / confs / 4003

diff --git a/test/confs/4003 b/test/confs/4003
index fbcf3021cb7c911cfc2ad4b27158d421e559412e..1d00cc695d84c221bbd625cd5b1b2ebb9707a183 100644 (file)
--- a/test/confs/4003
+++ b/test/confs/4003
@@ -1,12 +1,12 @@
-# Exim test configuration 4002
-# Content-scan: fsecure interface
+# Exim test configuration 4003
+# Content-scan: rspamd interface
 
 .include DIR/aux-var/std_conf_prefix
 
 log_selector = +subject
 primary_hostname = myhost.test.ex
 
-av_scanner = fsecure : DIR/eximdir/fsec_sock
+spamd_address = 127.0.0.1 11333 variant=rspamd
 
 # ----- Main settings -----
 
@@ -16,8 +16,11 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
-  accept !malware = <; * OPT
-  deny  logwrite = malware_name $malware_name
+  warn
+    spam = nobody
+  warn
+    log_message = $spam_action $spam_report
+  accept
 
 # ----- Routers -----