Revert "Support Rspamd. Patch from Andrew Lewis, lightly editorialised"

[exim.git] / test / confs / 4008

diff --git a/test/confs/4008 b/test/confs/4008
index 55c29033360b01d4d67a23e24295477bc4d41780..e10c2c024204b78c9f09c08c15cf90c605c4f17c 100644 (file)
--- a/test/confs/4008
+++ b/test/confs/4008
@@ -1,16 +1,12 @@
 # Exim test configuration 4008
-# Content-scan: rspamd interface
+# Content-scan: cmdline interface
+
+.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
 
-spamd_address = 127.0.0.1 11333 variant=rspamd
+av_scanner = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*)
 
 # ----- Main settings -----
 
@@ -20,11 +16,8 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
-  warn
-    spam = nobody
-  warn
-    log_message = $spam_action $spam_report
-  accept
+  accept !malware = * INSERT
+  deny  logwrite = malware_name $malware_name
 
 # ----- Routers -----