X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F4002;h=043a1eccb8fb72816f6e46afcc2595e61e2fa42c;hb=9555de77d7a57e65fff45a686f2430f46dbd38f5;hp=cc0d05ebb3066849d3853e5861c771d3cf36d7fa;hpb=0f0c8159c43045f4ad847a0129dca7eddd313285;p=exim.git

diff --git a/test/confs/4002 b/test/confs/4002
index cc0d05ebb..043a1eccb 100644
--- a/test/confs/4002
+++ b/test/confs/4002
@@ -1,16 +1,17 @@
 # Exim test configuration 4002
-# Content-scan: aveserver interface
+# Content-scan: spamassassin interface
+
+OPT= 127.0.0.1 7833
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 log_selector = +subject
+primary_hostname = myhost.test.ex
+
+# we need to set the sender
+trusted_users = CALLER
 
-av_scanner = aveserver : DIR/eximdir/aveserver_sock
+spamd_address = OPT
 
 # ----- Main settings -----
 
@@ -20,8 +21,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 = $callout_address $spam_action $spam_report
+  accept
 
 # ----- Routers -----