Docs: change example from match (RE) to match_ip (IP list)

[exim.git] / test / confs / 1115

diff --git a/test/confs/1115 b/test/confs/1115
index c1d57182193ffa022025f2c3c79d50cadb9261bc..c6247a4e04623a51a1f73a4ccff3ce6822abbe19 100644 (file)
--- a/test/confs/1115
+++ b/test/confs/1115
@@ -1,73 +1,24 @@
 # Exim test configuration 1115
-# ALPN
 
-SERVER =
-CONTROL =
+SERVER=
 
-.include DIR/aux-var/tls_conf_prefix
+.include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
-domainlist local_domains = test.ex : *.test.ex
+tls_on_connect_ports = PORT_D2
 
-acl_smtp_rcpt = accept
+acl_smtp_connect = check_conn
 
-tls_advertise_hosts = *
-tls_certificate = DIR/aux-fixed/cert1
+log_selector = +connection_reject
 
-.ifdef STRICT
-tls_alpn = STRICT
-.endif
-.ifdef REQUIRE
-hosts_require_alpn = *
-.endif
-
-
-# ------ ACL ------
+# ----- ACLs -----
 
 begin acl
 
-# ----- Routers -----
-
-begin routers
-
-client:
-  driver = accept
-  condition = ${if eq {SERVER}{server} {no}{yes}}
-  transport = send_to_server
-
-server:
-  driver = redirect
-  data = :blackhole:
-
-
-# ----- Transports -----
-
-begin transports
-
-send_to_server:
-  driver =     smtp
-  allow_localhost
-  hosts =      HOSTIPV4
-  port =       PORT_D
-  tls_verify_certificates = DIR/aux-fixed/cert1
-  tls_verify_cert_hostnames = :
-
-  hosts_require_tls = *
-  hosts_try_fastopen = :
-  tls_alpn =   CONTROL
-.ifdef REQUIRE
-  hosts_require_alpn = *
-.endif
-
-# ----- Retry -----
-
-
-begin retry
-
-* * F,5d,10s
-
+check_conn:
+  deny log_reject_target =
 
 # End