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: fix warning
[users/heiko/exim.git]
/
test
/
confs
/
4009
diff --git
a/test/confs/4009
b/test/confs/4009
index 573aa6a4aa8c957f06defc74dd6916aa19dd9b4d..dd21a218387e777036fadc05c97591241004c3c4 100644
(file)
--- a/
test/confs/4009
+++ b/
test/confs/4009
@@
-1,18
+1,17
@@
# Exim test configuration 4009
# Content-scan: spamassassin interface
# Exim test configuration 4009
# Content-scan: spamassassin interface
-OPT=
+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
log_selector = +subject
+primary_hostname = myhost.test.ex
+
+# we need to set the sender
+trusted_users = CALLER
-spamd_address =
127.0.0.1 7833
OPT
+spamd_address = OPT
# ----- Main settings -----
# ----- Main settings -----
@@
-25,7
+24,7
@@
c_data:
warn
spam = nobody
warn
warn
spam = nobody
warn
- log_message = $spam_action $spam_report
+ log_message = $
callout_address $
spam_action $spam_report
accept
# ----- Routers -----
accept
# ----- Routers -----