git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
testsuite: abstract out common conf settings
[users/heiko/exim.git]
/
test
/
confs
/
4006
diff --git
a/test/confs/4006
b/test/confs/4006
index 230f1159ef42567449ec2d91c015a5b9ecf736c2..3efca602c681f7e89662ae2efed74b8bb863727c 100644
(file)
--- a/
test/confs/4006
+++ b/
test/confs/4006
@@
-1,13
+1,10
@@
-# Exim test configuration 400
2
+# Exim test configuration 400
6
# Content-scan: avast interface
# Content-scan: avast 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 = avast : DIR/eximdir/avast_sock : OPTION
av_scanner = avast : DIR/eximdir/avast_sock : OPTION
@@
-19,7
+16,7
@@
acl_smtp_data = c_data
begin acl
c_data:
begin acl
c_data:
- accept !malware = *
+ accept !malware = *
INSERT
deny logwrite = malware_name $malware_name
# ----- Routers -----
deny logwrite = malware_name $malware_name
# ----- Routers -----