Merge from master into 4.next

[exim.git] / test / confs / 2020

diff --git a/test/confs/2020 b/test/confs/2020
deleted file mode 100644 (file)
index 7bde464152ce15b98fe0a671bfb0c733a7ffec50..0000000000000000000000000000000000000000
--- a/test/confs/2020
+++ /dev/null
@@ -1,51 +0,0 @@
-# Exim test configuration 2020
-
-SERVER=
-
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-
-# ----- Main settings -----
-
-acl_smtp_rcpt = accept
-
-log_selector = +tls_peerdn
-
-queue_only
-queue_run_in_order
-
-tls_advertise_hosts = *
-
-
-# ----- Routers -----
-
-begin routers
-
-abc:
-  driver = accept
-  transport = t1
-
-
-# ----- Transports -----
-
-begin transports
-
-t1:
-  driver = smtp
-  hosts = 127.0.0.1
-  allow_localhost
-  port = PORT_D
-
-
-# ----- Retry -----
-
-begin retry
-
-* * F,1d,1d
-
-# End

diff --git a/test/confs/2020 b/test/confs/2020
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..5ec250ecd8d951347302f6bdf4e44342c9e58ad2
--- /dev/null
+++ b/test/confs/2020
@@ -0,0 +1 @@
+2120
\ No newline at end of file