Merge branch 'master' into 4.next

[exim.git] / test / confs / 4004

diff --git a/test/confs/4004 b/test/confs/4004
index 22cbbd0f487cb824a4ed5a18ccf5cc281e71b41a..1d00cc695d84c221bbd625cd5b1b2ebb9707a183 100644 (file)
--- a/test/confs/4004
+++ b/test/confs/4004
@@ -1,15 +1,12 @@
-# Exim test configuration 4002
-# Content-scan: sophie interface
+# Exim test configuration 4003
+# Content-scan: rspamd interface

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
+log_selector = +subject

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 

-av_scanner = sophie : DIR/eximdir/sophie_sock
+spamd_address = 127.0.0.1 11333 variant=rspamd

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -19,8 +16,11 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
 begin acl
 
 c_data:

-  accept !malware = *
-  deny  logwrite = malware_name $malware_name
+  warn
+    spam = nobody
+  warn
+    log_message = $spam_action $spam_report
+  accept

 
 # ----- Routers -----
 
 
 # ----- Routers -----