SOCKS: move from Experimental to mainline

[exim.git] / test / confs / 4009

diff --git a/test/confs/4009 b/test/confs/4009
index b635195b61c60c2cd55444365852347e57c04b33..8b86f7ed6aefd24ae9e31bfa03d5c52c74331a26 100644 (file)
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -1,6 +1,8 @@
 # Exim test configuration 4009
 # Content-scan: spamassassin interface
 
 # Exim test configuration 4009
 # Content-scan: spamassassin interface
 

+OPT= 127.0.0.1 7833
+

 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex


@@ -8,9 +10,10 @@ spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+tls_advertise_hosts =

 log_selector = +subject
 
 log_selector = +subject
 

-spamd_address = 127.0.0.1 7833
+spamd_address = OPT

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


@@ -23,7 +26,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 -----