testsuite: abstract out common conf settings

diff --git a/test/aux-var-src/std_conf_prefix b/test/aux-var-src/std_conf_prefix
new file mode 100644 (file)
index 0000000..2565c26
--- /dev/null
+++ b/test/aux-var-src/std_conf_prefix
@@ -0,0 +1,2 @@
+.include DIR/aux-var/tls_conf_prefix
+tls_advertise_hosts =

diff --git a/test/aux-var-src/tls_conf_prefix b/test/aux-var-src/tls_conf_prefix
new file mode 100644 (file)
index 0000000..3beafd9
--- /dev/null
+++ b/test/aux-var-src/tls_conf_prefix
@@ -0,0 +1,13 @@
+exim_path = EXIM_PATH
+keep_environment =
+host_lookup_order = bydns
+spool_directory = DIR/spool
+
+.ifdef SERVER
+log_file_path = DIR/spool/log/SERVER%slog
+.else
+log_file_path = DIR/spool/log/%slog
+.endif
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME

diff --git a/test/confs/0003 b/test/confs/0003
index ccf723761930ada922ee5ec0fa900066d5948e61..af93db7c6d7a5a8105296f9a6ab6bf5a121332d6 100644 (file)
--- a/test/confs/0003
+++ b/test/confs/0003
@@ -1,13 +1,7 @@
 # Exim test configuration 0003
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 acl_smtp_rcpt = check_recipient
 domainlist local_domains = test.ex

diff --git a/test/confs/0004 b/test/confs/0004
index 12cd8dba952effa8808f14ef031c31654f98987c..8ebec4d981b438cba1d1954d689c6bd03ce2cad0 100644 (file)
--- a/test/confs/0004
+++ b/test/confs/0004
@@ -1,13 +1,7 @@
 # Exim test configuration 0004
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 acl_smtp_rcpt = check_recipient
 domainlist local_domains = test.ex

diff --git a/test/confs/0005 b/test/confs/0005
index b503b81a512b4e05410d4ccee118bd98e9c71281..7c0689c1675945292129a9bbcdcd9c0bee167ea2 100644 (file)
--- a/test/confs/0005
+++ b/test/confs/0005
@@ -1,13 +1,7 @@
 # Exim test configuration 0005
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0006 b/test/confs/0006
index 4cd84a275286e062cd3bc04dc2d46b5c59e77bbc..c01a2fe2e7a4d463ebbf48cd2c406bd0639829b4 100644 (file)
--- a/test/confs/0006
+++ b/test/confs/0006
@@ -1,13 +1,7 @@
 # Exim test configuration 0006
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0007 b/test/confs/0007
index 910c5a7f0ff35a690feec70ad2965f716e76daac..05631cc3982e1312861110b54384c1f7f8169163 100644 (file)
--- a/test/confs/0007
+++ b/test/confs/0007
@@ -1,13 +1,7 @@
 # Exim test configuration 0007
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0008 b/test/confs/0008
index de228d31e1a17ecd6975436bc2910bf3617a5183..91db09111b530e4b82a42984fed03f49482ebdcd 100644 (file)
--- a/test/confs/0008
+++ b/test/confs/0008
@@ -1,13 +1,7 @@
 # Exim test configuration 0008
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0009 b/test/confs/0009
index 34dee6e0af71e5727753348dacdc82669a19733b..422fe3d1d2271a6815cf7d145e9c64d62a032439 100644 (file)
--- a/test/confs/0009
+++ b/test/confs/0009
@@ -1,13 +1,7 @@
 # Exim test configuration 0009
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0010 b/test/confs/0010
index 9bf862dd445d2545a059f297b3c91dd4b6d0e03a..39e3fcf88ec8428470c16e4e3822140a3a5e615e 100644 (file)
--- a/test/confs/0010
+++ b/test/confs/0010
@@ -1,13 +1,7 @@
 # Exim test configuration 0010
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0011 b/test/confs/0011
index f1aa77a5e65c5c421e924c03e0bc8ba844923ff6..f8c04763d927ff29737bb09005b3632193b6fe99 100644 (file)
--- a/test/confs/0011
+++ b/test/confs/0011
@@ -1,13 +1,7 @@
 # Exim test configuration 0011
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0012 b/test/confs/0012
index 7df08cb097c04ea69884375df41dfae00da42b16..b367e8992a92ea7273cc6e2775bdf56f517030fa 100644 (file)
--- a/test/confs/0012
+++ b/test/confs/0012
@@ -1,13 +1,7 @@
 # Exim test configuration 0012
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0013 b/test/confs/0013
index 61f0d579d7fc638e125fe7e4c8d05d16aefa8f8f..1b2cec88f8acf9bab2581abce51c014a6a0e0627 100644 (file)
--- a/test/confs/0013
+++ b/test/confs/0013
@@ -1,15 +1,9 @@
 # Exim test configuration 0013
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0014 b/test/confs/0014
index 7f15c410855f1891b0bff7d2e5ac6baf8efcbbbf..1fdd92d0c29c6087bc2aeaa46cd476aa1ee11304 100644 (file)
--- a/test/confs/0014
+++ b/test/confs/0014
@@ -1,14 +1,8 @@
 # Exim test configuration 0014
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0015 b/test/confs/0015
index 593c29555462c71a51ede82a1094ba9ce84d0d6b..c6fccd3162a19c829bfa14893264c55b8db388e7 100644 (file)
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -1,13 +1,7 @@
 # Exim test configuration 0015
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0016 b/test/confs/0016
index 7001b97749d3bb2dfb9369798ae2220cf06dee1e..4260c88be97859afb055fa2d60d73abc60684622 100644 (file)
--- a/test/confs/0016
+++ b/test/confs/0016
@@ -1,13 +1,7 @@
 # Exim test configuration 0016
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0017 b/test/confs/0017
index 6e36a38ea3a0f2b87623c092735d29391c251cb7..74585c6892eede38a7764a28b18b069b162d8a95 100644 (file)
--- a/test/confs/0017
+++ b/test/confs/0017
@@ -1,13 +1,7 @@
 # Exim test configuration 0017
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0018 b/test/confs/0018
index 6fbfb4342263a0a85658974df476b4f3eefff878..4b85cf3d3bd2d98d259b4952f6b4b0529f66b639 100644 (file)
--- a/test/confs/0018
+++ b/test/confs/0018
@@ -1,13 +1,7 @@
 # Exim test configuration 0018
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0019 b/test/confs/0019
index 5757c1cf6870900b23b395b9e36832f8f8e1cd38..dbb303b6e4ef6b2d5536f247cba2401ead10cfe1 100644 (file)
--- a/test/confs/0019
+++ b/test/confs/0019
@@ -1,13 +1,7 @@
-# Exim test configuration 2409
+# Exim test configuration 0019
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0020 b/test/confs/0020
index 6672ccf2f6a5f7440a19ee60ddd9b95b699b533b..ce48c884c00b9bccb5812e040d9cd5b4a750df4b 100644 (file)
--- a/test/confs/0020
+++ b/test/confs/0020
@@ -1,14 +1,8 @@
 # Exim test configuration 0020
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0021 b/test/confs/0021
index c48c0e08e9680f641488e4e98066f343f3568f2d..6205eae631b3cc51338f53b7ffd58b4844c0751d 100644 (file)
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -3,15 +3,9 @@
 SERVER=
 BR=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0022 b/test/confs/0022
index 7a2742790dc4f4ddc0c6c837cd4235bf030e77f8..bd04442aa783bffb01dc27761566bfbd19b70ba2 100644 (file)
--- a/test/confs/0022
+++ b/test/confs/0022
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0023 b/test/confs/0023
index b59a52f92d7c37b39b509a0ddb44a9c4dac8f352..2481976ce09531ea3c38431ef8340392b09c3224 100644 (file)
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -2,15 +2,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0024 b/test/confs/0024
index ee60a322e8d886393dbea2991caa40ebd6b44be0..3dbbc2c258a464c2d2b13e130fa0fb02e898b56b 100644 (file)
--- a/test/confs/0024
+++ b/test/confs/0024
@@ -1,14 +1,8 @@
 # Exim test configuration 0024
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0025 b/test/confs/0025
index 6477950becb6ca6e30f05e76f94749fd6cadaf71..3ecc5dd6898a1b6377d1826ed0afd8162b24498b 100644 (file)
--- a/test/confs/0025
+++ b/test/confs/0025
@@ -1,14 +1,8 @@
 # Exim test configuration 0025
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0026 b/test/confs/0026
index 2b1763f87c8434073127c790f0bca622847a8900..07fa409760ef9f23067182fa4313b78530295fc5 100644 (file)
--- a/test/confs/0026
+++ b/test/confs/0026
@@ -1,14 +1,8 @@
 # Exim test configuration 0026
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0027 b/test/confs/0027
index f671831b0d0d793c8f3249d94bbf26e72a36ce61..9c775bd5d45351b43c6b982b6d8d55fd22d2635b 100644 (file)
--- a/test/confs/0027
+++ b/test/confs/0027
@@ -1,14 +1,8 @@
 # Exim test configuration 0027
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0028 b/test/confs/0028
index 6308f8358693962733925454af6715df6d1251ea..149d8eda8277ec2014676d66c8a7789ce20ce75d 100644 (file)
--- a/test/confs/0028
+++ b/test/confs/0028
@@ -1,14 +1,8 @@
 # Exim test configuration 0028
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0029 b/test/confs/0029
index d65cf1181a9d166c31dde670d11f74b3b4576493..09e77963fc034e7ae17396aeaf72f240b51d8f68 100644 (file)
--- a/test/confs/0029
+++ b/test/confs/0029
@@ -1,14 +1,8 @@
 # Exim test configuration 0029
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0030 b/test/confs/0030
index 89ced1f25bcd4e73cf21e8c92c47fd9e6057434a..446a7ede8fcc92b740dc63df884429ccc62bd560 100644 (file)
--- a/test/confs/0030
+++ b/test/confs/0030
@@ -1,14 +1,8 @@
 # Exim test configuration 0030
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0031 b/test/confs/0031
index 2716b59cb1430ead5b8ea5183aee0e126d4431ef..e3f0360fc5cc85d8152fec3f1dd2f2746e0fd4ae 100644 (file)
--- a/test/confs/0031
+++ b/test/confs/0031
@@ -1,14 +1,8 @@
 # Exim test configuration 0031
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0032 b/test/confs/0032
index 8368f155a0cad422471693ecdc656188dea62f40..961cefadd8758c3fa58602629480a13734d577ea 100644 (file)
--- a/test/confs/0032
+++ b/test/confs/0032
@@ -1,14 +1,8 @@
 # Exim test configuration 0032
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 
 # ----- Main settings -----

diff --git a/test/confs/0033 b/test/confs/0033
index 825126bb7d51272e48a8667c933e3dad5a568329..ca06da772d831cabea2daa4d6c6fae855f7868fe 100644 (file)
--- a/test/confs/0033
+++ b/test/confs/0033
@@ -1,14 +1,8 @@
 # Exim test configuration 0033
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0034 b/test/confs/0034
index 8dbe9ea1d8884c159179dd9088179faacbd06561..8eb9dce69d0cd3f5817a3cba359cfa9e53bf2941 100644 (file)
--- a/test/confs/0034
+++ b/test/confs/0034
@@ -1,14 +1,8 @@
 # Exim test configuration 0034
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0035 b/test/confs/0035
index a8cd5c66a15754459f10182a145533e2c771fcaf..8d34269a2f2e67e81ac263b07905937a6abdd8b3 100644 (file)
--- a/test/confs/0035
+++ b/test/confs/0035
@@ -3,15 +3,9 @@
 SERVER=
 SUBMISSION_OPTIONS=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0036 b/test/confs/0036
index 7d54acbee203385ee5dd2e788ba8faabc2665ce3..48479c7876dbb2666ceddfda9fe8971c4ec0c953 100644 (file)
--- a/test/confs/0036
+++ b/test/confs/0036
@@ -2,15 +2,9 @@
 
 SERVER =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0037 b/test/confs/0037
index 56323db4bb5204eda7f688832f93c6a3c6932384..8ba94ded1defca8afaa6c131d541f16cdb940354 100644 (file)
--- a/test/confs/0037
+++ b/test/confs/0037
@@ -2,14 +2,8 @@
 
 FILTER_PREPEND_HOME=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0038 b/test/confs/0038
index b95b140b51c2499b8086ef0bb2ca5e1c0cf18af0..0ef9028f163792ec24af2dbf81a7b22da88c6eda 100644 (file)
--- a/test/confs/0038
+++ b/test/confs/0038
@@ -4,15 +4,9 @@ RRATELIMIT=0/1h/strict
 DRATELIMIT=0/1h/per_byte/strict
 ACLRCPT=check_rcpt
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0039 b/test/confs/0039
index 5ca25b2e4a509e9607c489b71161e18740b9d9f8..8ca8b1eeca3f851a244025a045f64e3f7cb0721d 100644 (file)
--- a/test/confs/0039
+++ b/test/confs/0039
@@ -2,15 +2,9 @@
 
 QDG=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0040 b/test/confs/0040
index 88b63f1f79cc339ae772a0b237e841fdcc8af73f..35453a0dd3373d65c19e7dc89fb18a2129ab4fdf 100644 (file)
--- a/test/confs/0040
+++ b/test/confs/0040
@@ -1,13 +1,7 @@
 # Exim test configuration 0040
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0041 b/test/confs/0041
index e0b820fb2741eef445d2b2c44d239377f0209779..5157170f2cb70bd60d6441ce5c26950c52071569 100644 (file)
--- a/test/confs/0041
+++ b/test/confs/0041
@@ -1,13 +1,7 @@
 # Exim test configuration 0041
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0042 b/test/confs/0042
index a4a81bfbe9ac2df68c300f05b07266d034368ef5..14c8a963567fd51dd55ebc0c8710da3b4ac98d5e 100644 (file)
--- a/test/confs/0042
+++ b/test/confs/0042
@@ -1,13 +1,7 @@
 # Exim test configuration 0042
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0043 b/test/confs/0043
index 4db392cd13743d64d940d37dc00958ca3a428ba4..0bf3547c7192cde61fed8e8c7f82c2393f2e3cf0 100644 (file)
--- a/test/confs/0043
+++ b/test/confs/0043
@@ -1,13 +1,7 @@
 # Exim test configuration 0043
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0044 b/test/confs/0044
index 9e3f020c9d13318f0884e3f20bb1f5869976d109..e4db43db01662f6eecec92249c7d7f8e2979e3fc 100644 (file)
--- a/test/confs/0044
+++ b/test/confs/0044
@@ -1,13 +1,7 @@
 # Exim test configuration 0044
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0045 b/test/confs/0045
index f8caf1419fd3f1a9a034fe14c538af1e1c60184a..a59c8e2c11ff2a80d45b1b3584ceb2ef4b7ae752 100644 (file)
--- a/test/confs/0045
+++ b/test/confs/0045
@@ -1,13 +1,7 @@
 # Exim test configuration 0045
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0046 b/test/confs/0046
index 4e7ff862a4a97a044234d785ffebf4e1ea88d748..9fff3b91b92432986015610fd42fedf726a50a25 100644 (file)
--- a/test/confs/0046
+++ b/test/confs/0046
@@ -2,14 +2,8 @@
 
 NL=FALSE
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0047 b/test/confs/0047
index 5e7d27d9707fb3017746a1ab03fb5e1f2ddb418d..187f855ef8c2008a77a5b428c495fcdce3495bca 100644 (file)
--- a/test/confs/0047
+++ b/test/confs/0047
@@ -1,13 +1,7 @@
 # Exim test configuration 0047
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0048 b/test/confs/0048
index 86560d587cf97a1bca9d66e69357025bb6540e19..9c2d4428fd904d8f31e2db61a6bc98ad0b90d36c 100644 (file)
--- a/test/confs/0048
+++ b/test/confs/0048
@@ -2,14 +2,8 @@
 
 MESSAGE_LOGS = true
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0049 b/test/confs/0049
index 0de91eeed23bdb41ab8395d3bd9bb24b66b7c508..a00dde1f52b438633c92787d8e7004f5fff9922e 100644 (file)
--- a/test/confs/0049
+++ b/test/confs/0049
@@ -1,14 +1,8 @@
 # Exim test configuration 0049
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0050 b/test/confs/0050
index f709ad674831d67bf5b4dc340940f90c4965dd73..32a822a9b06c212ce9caa727ce0f843e29342d1f 100644 (file)
--- a/test/confs/0050
+++ b/test/confs/0050
@@ -1,15 +1,9 @@
 # Exim test configuration 0050
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0051 b/test/confs/0051
index 34016ab81f3b557bcb90deb86103b47b93d63028..2fde9e5572355981a41a8277e3e37b9945568ea9 100644 (file)
--- a/test/confs/0051
+++ b/test/confs/0051
@@ -1,15 +1,9 @@
 # Exim test configuration 0051
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0052 b/test/confs/0052
index 2e2c13133c49cbab9286c7b32bfc7b63b74bbb3b..2af555ccae3a35dbbefba5ee81c9945e6874a22b 100644 (file)
--- a/test/confs/0052
+++ b/test/confs/0052
@@ -1,15 +1,9 @@
 # Exim test configuration 0052
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0053 b/test/confs/0053
index 16702ffeb7aabce5ba3d8b2e630b4ea2e919d03f..04263a59f85f4dac1eb7ae1d8f87600e7170ba77 100644 (file)
--- a/test/confs/0053
+++ b/test/confs/0053
@@ -1,15 +1,9 @@
 # Exim test configuration 0053
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0054 b/test/confs/0054
index ee63ec24bb4aea6bcdd37e8a410f9a071cda63c7..3ad8751572a12c02b753ab0c7abd4d5e8efa6cce 100644 (file)
--- a/test/confs/0054
+++ b/test/confs/0054
@@ -1,15 +1,9 @@
 # Exim test configuration 0054
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 trusted_users = CALLER
+primary_hostname = myhost.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0055 b/test/confs/0055
index ce1b22514daf74b9e2b0df07d9807a38db1e9882..72a2be7402b7ddf9ceb2c0c3a81f7fd855146275 100644 (file)
--- a/test/confs/0055
+++ b/test/confs/0055
@@ -1,14 +1,8 @@
 # Exim test configuration 0055
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0056 b/test/confs/0056
index 299448369e780de3e07c0b1dabe703df2a664bf0..1678e206323f74ede066dbb276a885396191fa5d 100644 (file)
--- a/test/confs/0056
+++ b/test/confs/0056
@@ -1,14 +1,8 @@
 # Exim test configuration 0056
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0057 b/test/confs/0057
index f2bc88f8a2acbae47050eb1ad47137ed0da73922..db09830adef8e0958d071406b394ec7f73634b97 100644 (file)
--- a/test/confs/0057
+++ b/test/confs/0057
@@ -1,14 +1,8 @@
 # Exim test configuration 0057
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0058 b/test/confs/0058
index 2b15f6290a27fb68f4992dae5ecd467efec9520a..2b52453a0934a8496ffaeb99883f1ca468f3c1c2 100644 (file)
--- a/test/confs/0058
+++ b/test/confs/0058
@@ -1,14 +1,8 @@
 # Exim test configuration 0058
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0059 b/test/confs/0059
index f591bf6b350bede8e0fad9fde8757174ebe55809..40e877be8188e596d8b524c8a281953a44c12e74 100644 (file)
--- a/test/confs/0059
+++ b/test/confs/0059
@@ -1,14 +1,8 @@
 # Exim test configuration 0059
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0060 b/test/confs/0060
index 8ce8d1012d474ff0829fce7c7665a2eb5187c996..6ff220906a5b03a1479f56bffd7d32f7e661db8e 100644 (file)
--- a/test/confs/0060
+++ b/test/confs/0060
@@ -1,14 +1,8 @@
 # Exim test configuration 0060
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0061 b/test/confs/0061
index 70d21834e257a237d740a708dec51a958669c73b..07c85e4a9c7e9164b5bd29e74c64f59b8a2aa959 100644 (file)
--- a/test/confs/0061
+++ b/test/confs/0061
@@ -1,14 +1,8 @@
 # Exim test configuration 0061
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = ten-1.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0062 b/test/confs/0062
index 7e64746554d44e43512b0120c0aa5699d137408c..b5d47c862b764be7af5aee4a31762916199dccb3 100644 (file)
--- a/test/confs/0062
+++ b/test/confs/0062
@@ -1,14 +1,8 @@
 # Exim test configuration 0062
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0063 b/test/confs/0063
index be66b1a3fcdbcef9bd0530d91a2838e67d97e97d..b297ec01172af12f847ef5dbf10f4497dd9b68bc 100644 (file)
--- a/test/confs/0063
+++ b/test/confs/0063
@@ -1,14 +1,8 @@
 # Exim test configuration 0063
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0064 b/test/confs/0064
index 4feaed25d0c81da54a75f4ff433db83c36a4ef69..f0d9e9618d5af3838506fd7901242656b2eb282b 100644 (file)
--- a/test/confs/0064
+++ b/test/confs/0064
@@ -1,14 +1,8 @@
 # Exim test configuration 0064
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0065 b/test/confs/0065
index 7d08f964090073e3d3b54dffd0ca59bef54d67a4..fb01f377267e627821e27ba4908ac4f809a961c2 100644 (file)
--- a/test/confs/0065
+++ b/test/confs/0065
@@ -1,14 +1,8 @@
 # Exim test configuration 0065
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0066 b/test/confs/0066
index 959b878e3e7ae45f44241f94407e1245aa67a213..dcf3bcffc65c72b78f3c95fe29c8832a32397f99 100644 (file)
--- a/test/confs/0066
+++ b/test/confs/0066
@@ -1,14 +1,8 @@
 # Exim test configuration 0066
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0067 b/test/confs/0067
index ac2af9c198283a22636efe71a290ff309798cd27..35bd3b24c31aba7e897d95b92187dd0cb77e9b5e 100644 (file)
--- a/test/confs/0067
+++ b/test/confs/0067
@@ -1,14 +1,8 @@
 # Exim test configuration 0067
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0068 b/test/confs/0068
index 2de360fbdee56d567dac4eaaf2f3f4fc5818961b..f8078fdf3848c10950d8a818b291d60600aebd4a 100644 (file)
--- a/test/confs/0068
+++ b/test/confs/0068
@@ -1,13 +1,7 @@
 # Exim test configuration 0068
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0069 b/test/confs/0069
index 23685e40ec0b25ca592453050c01b0634fc589c4..ca81da915b8308de8e002b6b8367d7e07ad34729 100644 (file)
--- a/test/confs/0069
+++ b/test/confs/0069
@@ -2,15 +2,9 @@
 
 LOG_SELECTOR=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0070 b/test/confs/0070
index 4ffe3668ca63ffd5c992e3235e7603edfa4122ec..9ef3b2ad825fbfd2fd16dc9860188cc03d871e45 100644 (file)
--- a/test/confs/0070
+++ b/test/confs/0070
@@ -2,15 +2,9 @@
 
 HVH=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0071 b/test/confs/0071
index e18ab0bbfb04c37c19c80df75642c60c7fe9cf67..d7ab2ff5d624713177c77234da5487a6084e7453 100644 (file)
--- a/test/confs/0071
+++ b/test/confs/0071
@@ -1,13 +1,7 @@
 # Exim test configuration 0071
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0072 b/test/confs/0072
index 94c4dcbe5cc71557b58b992f219d4b2d12b75ad9..9bb73984d6cd90aa58c62725f935cc313641a5d1 100644 (file)
--- a/test/confs/0072
+++ b/test/confs/0072
@@ -4,14 +4,8 @@ ONCE=once=DIR/spool/autolog
 ONLY=
 RETURN=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0073 b/test/confs/0073
index f6c18247dedc321b4f47a37ea7a7b7b98ff61971..da716efb6b94548839b33a30757ed335caffa4a6 100644 (file)
--- a/test/confs/0073
+++ b/test/confs/0073
@@ -1,13 +1,7 @@
 # Exim test configuration 0073
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0074 b/test/confs/0074
index ab300745540cdd183bee66b15a5ea61540c5cf89..3102206b0b4476c3bdd02cfc0e0bb66125223d09 100644 (file)
--- a/test/confs/0074
+++ b/test/confs/0074
@@ -1,13 +1,7 @@
 # Exim test configuration 0074
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0075 b/test/confs/0075
index cb9d472ff4fba1d38c30a11385dc28bbe686485b..8b8c77ca6783f4ff275f46987389bc7624be73af 100644 (file)
--- a/test/confs/0075
+++ b/test/confs/0075
@@ -1,13 +1,7 @@
 # Exim test configuration 0075
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0076 b/test/confs/0076
index bd3863cf784f72f7a498681277e87356419d8170..1415280f9def6bbf27ddb37c5749d36455dc7678 100644 (file)
--- a/test/confs/0076
+++ b/test/confs/0076
@@ -1,13 +1,7 @@
 # Exim test configuration 0076
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0077 b/test/confs/0077
index b2138536e06bee37ca042ae83b0bd3330b9316d0..564554e3924539ae22c416d170f82af5e4627465 100644 (file)
--- a/test/confs/0077
+++ b/test/confs/0077
@@ -1,14 +1,8 @@
 # Exim test configuration 0077
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0078 b/test/confs/0078
index 1be361abdd3b35f5aeb4b4530b2cb54a9bce5b6b..aa1e445f358963735644ac26a4dee310c6dd5584 100644 (file)
--- a/test/confs/0078
+++ b/test/confs/0078
@@ -1,14 +1,8 @@
 # Exim test configuration 0078
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0079 b/test/confs/0079
index f9be0824403f55a95bb0aa84cf8ba0203e7150cd..25ef65879c5d2f6afbc77b96554f7b17944e3554 100644 (file)
--- a/test/confs/0079
+++ b/test/confs/0079
@@ -1,13 +1,7 @@
 # Exim test configuration 0079
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0080 b/test/confs/0080
index 4bc2e3a3b5b227cf0dd131936259f694bdfe792d..fbe026c262dc338015621b6b01be7c4347347c6d 100644 (file)
--- a/test/confs/0080
+++ b/test/confs/0080
@@ -1,13 +1,7 @@
 # Exim test configuration 0080
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0081 b/test/confs/0081
index 4e2f4949e14469a04d08494acd0b6f7a4c262e9f..f403728c3c4b28a9f93e56258df7be5ab945aa34 100644 (file)
--- a/test/confs/0081
+++ b/test/confs/0081
@@ -1,13 +1,7 @@
 # Exim test configuration 0081
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0082 b/test/confs/0082
index b4bfc76934dc400ef1f2ea2eafdc8f43d377f81b..29ff8d15cafa3ded3d4c954c79db0c715c57cced 100644 (file)
--- a/test/confs/0082
+++ b/test/confs/0082
@@ -1,13 +1,7 @@
 # Exim test configuration 0082
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0083 b/test/confs/0083
index 37c7bac2e4153587fd4dfbc32c872ae9abf4aa9c..fcae1f5d1bef283ce5af7c7ec608f91b61738602 100644 (file)
--- a/test/confs/0083
+++ b/test/confs/0083
@@ -1,13 +1,7 @@
 # Exim test configuration 0083
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0084 b/test/confs/0084
index b4530996f59bdc59fbd7a79bd8e9d2fff37440a2..94e386e02434bc656ef7c7858a49a81b6fefb345 100644 (file)
--- a/test/confs/0084
+++ b/test/confs/0084
@@ -1,14 +1,8 @@
 # Exim test configuration 0084
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0085 b/test/confs/0085
index 0a74e159131aa6835903ad698da716b9dc8574c2..25eea9e903f0bb65b8fb094448f1f7fc2f2c1b05 100644 (file)
--- a/test/confs/0085
+++ b/test/confs/0085
@@ -1,14 +1,8 @@
 # Exim test configuration 0085
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0086 b/test/confs/0086
index 256cc6047ff2d481eaeaf6db0100cad156d360a6..a0a29b62d6ca7f572f95214524be6eac3a9bba70 100644 (file)
--- a/test/confs/0086
+++ b/test/confs/0086
@@ -1,14 +1,8 @@
 # Exim test configuration 0086
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0087 b/test/confs/0087
index f59143e3f473ee9a6b08ec030d2c941ef301f264..8141edb98ba2dfd5ad33275a9948dafe2985b473 100644 (file)
--- a/test/confs/0087
+++ b/test/confs/0087
@@ -1,14 +1,8 @@
 # Exim test configuration 0087
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0088 b/test/confs/0088
index 0c1d5884ebef7c612bc7c28ef0022f02d75c8e82..054944d95a9e9c7a671d8c21eec6623a30fb9a99 100644 (file)
--- a/test/confs/0088
+++ b/test/confs/0088
@@ -1,14 +1,8 @@
 # Exim test configuration 0088
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0089 b/test/confs/0089
index ccb0283e21eb945605f395af1873b314817b680a..b8bd142dbebc1fee02a36a590209cc3e3c14631e 100644 (file)
--- a/test/confs/0089
+++ b/test/confs/0089
@@ -1,14 +1,8 @@
 # Exim test configuration 0089
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0090 b/test/confs/0090
index 3612e8aa88e9da9f595d120b1285ce9c1a00c872..907d275440575b411bc0ede0d730a21e74df0e0f 100644 (file)
--- a/test/confs/0090
+++ b/test/confs/0090
@@ -1,14 +1,8 @@
 # Exim test configuration 0090
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0091 b/test/confs/0091
index 3dcc12b0a9b86624df27560872a16d842e8029e5..2ef91af8f80e35b0d8a4fbd699a4bab345b7a690 100644 (file)
--- a/test/confs/0091
+++ b/test/confs/0091
@@ -1,14 +1,8 @@
 # Exim test configuration 0091
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0092 b/test/confs/0092
index 8497dc0442db6fde82a367711c7ab6bda03aa63d..e5cdf119a9bb48054d8b6a5629100d9aa949285d 100644 (file)
--- a/test/confs/0092
+++ b/test/confs/0092
@@ -7,15 +7,9 @@ domainlist local_domains = test.ex : *.test.ex
 
 domainlist relay_domains = test.ex
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0093 b/test/confs/0093
index 0cdc58b38b2c183225e6f0fa4f6f126a53bb9f5d..2ed0a520742a46f0d4fae7341e545e0485988307 100644 (file)
--- a/test/confs/0093
+++ b/test/confs/0093
@@ -1,13 +1,7 @@
 # Exim test configuration 0093
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0094 b/test/confs/0094
index b586dc4341a1144349b784cce55426661dd99a4f..04c9d80789997d17a36808ca99440cba3f50344f 100644 (file)
--- a/test/confs/0094
+++ b/test/confs/0094
@@ -1,13 +1,7 @@
 # Exim test configuration 0094
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0095 b/test/confs/0095
index fb79c9d289206413f1def7ca4744da50de0878a2..c20b06d7cc100c257bdd7f8d93e26b2aeaee55a9 100644 (file)
--- a/test/confs/0095
+++ b/test/confs/0095
@@ -3,15 +3,9 @@
 ERT=
 QWM=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0096 b/test/confs/0096
index 5ef2ec20e202adf62b2af243978a52e5edc4722c..ff5f5cebc1dff8e7fcbef31d838fe0846f56f371 100644 (file)
--- a/test/confs/0096
+++ b/test/confs/0096
@@ -1,13 +1,7 @@
 # Exim test configuration 0096
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0097 b/test/confs/0097
index 2ad1b5e1fb3d8dbcad0fe2492c4a6586fe1ad57d..0841952bf1cefb1d1c9ce5bec8f44766411ddac2 100644 (file)
--- a/test/confs/0097
+++ b/test/confs/0097
@@ -1,13 +1,7 @@
 # Exim test configuration 0097
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0098 b/test/confs/0098
index 60402deaf362a4a8c18d5f233bcc553dd383bef4..465c2310aea7b831c8b8fa6e77c607939f984b03 100644 (file)
--- a/test/confs/0098
+++ b/test/confs/0098
@@ -2,14 +2,8 @@
 
 WMF=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0099 b/test/confs/0099
index 122856ce7a9d6de1e2a5e62da3f234fe0caaa16a..8db58dcb0c90c3116b703806cadb12ae5b0d47b7 100644 (file)
--- a/test/confs/0099
+++ b/test/confs/0099
@@ -2,14 +2,8 @@
 
 RETRY =
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0100 b/test/confs/0100
index 55cd947b5a3167d4b1d16911798a2128b891bf26..c404d5a73f663c2bd5db8b7b36735ba89f2cd97a 100644 (file)
--- a/test/confs/0100
+++ b/test/confs/0100
@@ -1,13 +1,7 @@
 # Exim test configuration 0100
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0101 b/test/confs/0101
index 05832fb45122cafbde2eef9c4068b54e902f63b3..377eae705246c33d505d1b080ebff7821f2cad1b 100644 (file)
--- a/test/confs/0101
+++ b/test/confs/0101
@@ -1,13 +1,7 @@
 # Exim test configuration 0101
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0102 b/test/confs/0102
index ac33f72f443135d12956687179dda24dffbdcf47..dde11a5e9e84aa600f23778723c7fd2dee0b2315 100644 (file)
--- a/test/confs/0102
+++ b/test/confs/0102
@@ -1,13 +1,7 @@
 # Exim test configuration 0102
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0103 b/test/confs/0103
index 9d40134e7b4412447c856473637d608892243062..9a136c7bc0979b7c9137eb5668df3cdadccc2124 100644 (file)
--- a/test/confs/0103
+++ b/test/confs/0103
@@ -1,13 +1,7 @@
 # Exim test configuration 0103
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0104 b/test/confs/0104
index 6101f0c1cd1ca89a19ff21e8a4dc3eb533006394..de0889adb41e7a7bc5b66f7dce5e60431bcb0381 100644 (file)
--- a/test/confs/0104
+++ b/test/confs/0104
@@ -1,13 +1,7 @@
 # Exim test configuration 0104
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0105 b/test/confs/0105
index a6763313fdebd490e6fe0c6f07862028ece16061..1b954f4605e824a86c9f9589e3000637226a7ee8 100644 (file)
--- a/test/confs/0105
+++ b/test/confs/0105
@@ -1,13 +1,7 @@
 # Exim test configuration 0105
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0106 b/test/confs/0106
index 52130ede0a000f189f42878884cc4bf96e83dfb1..ef91e8b106deeb52ef7ebea72e1990369fb3ab2d 100644 (file)
--- a/test/confs/0106
+++ b/test/confs/0106
@@ -1,14 +1,8 @@
 # Exim test configuration 0106
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0107 b/test/confs/0107
index 06e7b83ae734ce26c517d100c74e4db962116995..9bbb7e7a3b2fc4fefa065ad74332690e76700677 100644 (file)
--- a/test/confs/0107
+++ b/test/confs/0107
@@ -1,13 +1,7 @@
 # Exim test configuration 0107
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0108 b/test/confs/0108
index 37c53de6e8a765f0cb961391deb84ee18d1c208f..a4ee442e2428c872cc9ebf5f31065310b4706d49 100644 (file)
--- a/test/confs/0108
+++ b/test/confs/0108
@@ -1,13 +1,7 @@
 # Exim test configuration 0108
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0109 b/test/confs/0109
index 38401bdb9b66c9d683c230bfb14536ea67c7ed01..59957b96b319a3d230230e92d67ff7cd12758176 100644 (file)
--- a/test/confs/0109
+++ b/test/confs/0109
@@ -1,13 +1,7 @@
 # Exim test configuration 0109
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0110 b/test/confs/0110
index d8fb4a9e7aab81e1962bbdf5d0a5a7fb93fa0488..361c12fb40f5549b904d172f69492e989b556aa9 100644 (file)
--- a/test/confs/0110
+++ b/test/confs/0110
@@ -1,13 +1,7 @@
 # Exim test configuration 0110
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0111 b/test/confs/0111
index 377a9a0626bbb703d4daf4e385d2a251008e84ff..61fc9a887f8ad9bbd174609f3f40385cd2487f9d 100644 (file)
--- a/test/confs/0111
+++ b/test/confs/0111
@@ -1,13 +1,7 @@
 # Exim test configuration 0111
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0112 b/test/confs/0112
index bb133227f883d46898d340d3492bdd8147c1e92a..06e436abb6efcf2dcf12eb87d40106a5968e1ceb 100644 (file)
--- a/test/confs/0112
+++ b/test/confs/0112
@@ -1,13 +1,7 @@
 # Exim test configuration 0112
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0113 b/test/confs/0113
index a24c029b588473e6856c6e16fc198302b6a04d77..1fd61009fce35b00b0f47e7efb70325656e9184a 100644 (file)
--- a/test/confs/0113
+++ b/test/confs/0113
@@ -1,13 +1,7 @@
 # Exim test configuration 0113
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0114 b/test/confs/0114
index acaf05c03e6a1337b8afe8de226cee06064744e7..d5a60bb004062c83249c10343ea1fe81499ad1d7 100644 (file)
--- a/test/confs/0114
+++ b/test/confs/0114
@@ -1,13 +1,7 @@
 # Exim test configuration 0114
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0115 b/test/confs/0115
index ad4d469a168e181227544a204f4fc87d3d7eafb6..799112f08c8dd323536b6940168faf1dbf4f2e27 100644 (file)
--- a/test/confs/0115
+++ b/test/confs/0115
@@ -1,13 +1,7 @@
 # Exim test configuration 0115
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0116 b/test/confs/0116
index da70ac0e51fb26b50c429b78cc43fe3c7b54a3f8..313d32c6301c0fb8b69aad0792ca62dda1f2caf4 100644 (file)
--- a/test/confs/0116
+++ b/test/confs/0116
@@ -1,13 +1,7 @@
 # Exim test configuration 0116
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0117 b/test/confs/0117
index f0bcd89f30b9f837d54b92d636a3a19eaa81109f..5a266d32bd25b026c7817ab808a9bcb5350986c3 100644 (file)
--- a/test/confs/0117
+++ b/test/confs/0117
@@ -1,13 +1,7 @@
 # Exim test configuration 0117
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0118 b/test/confs/0118
index 0223df01f69fead49a4a64fa09dd28ea357ccbc2..cf8838f32a2bc9fc992d66bb8a389f179388844e 100644 (file)
--- a/test/confs/0118
+++ b/test/confs/0118
@@ -1,13 +1,7 @@
 # Exim test configuration 0118
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0119 b/test/confs/0119
index 74cd7ae2c5b0f48688061b23d1ee5203cc0874ef..4514635e5d9d7aa30ad3badf3f701a0c8274b6e3 100644 (file)
--- a/test/confs/0119
+++ b/test/confs/0119
@@ -1,13 +1,7 @@
 # Exim test configuration 0119
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0120 b/test/confs/0120
index ddba4d32de2054da6195c01173f942b0c43c6af4..95a5b3e8ae5a9dbc6a0c50233eb59cc09f5cf590 100644 (file)
--- a/test/confs/0120
+++ b/test/confs/0120
@@ -1,13 +1,7 @@
 # Exim test configuration 0120
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0121 b/test/confs/0121
index 3d5e8472149eac76cbe12851e5a3dec7841e8019..ca2d338a1e82b25dc42f939445886c9fd1c4dafa 100644 (file)
--- a/test/confs/0121
+++ b/test/confs/0121
@@ -1,13 +1,7 @@
 # Exim test configuration 0121
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0122 b/test/confs/0122
index bec8032f7d79f3302b4b7314961f0edd12c9280b..3fec1235d4d552a79d9c6fe0c3b17f3549b445ed 100644 (file)
--- a/test/confs/0122
+++ b/test/confs/0122
@@ -1,13 +1,7 @@
 # Exim test configuration 0122
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0123 b/test/confs/0123
index 250ac1d168d8b8408a4f48770e45c43fb91f9cee..6eae763a148e64940a05844d3a5c3c97876e5935 100644 (file)
--- a/test/confs/0123
+++ b/test/confs/0123
@@ -1,13 +1,7 @@
 # Exim test configuration 0123
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0124 b/test/confs/0124
index 5cc80384170dbbed040e390deb4a57996adca93c..da81a998a5dad90064ff4e200de6155a810a4b85 100644 (file)
--- a/test/confs/0124
+++ b/test/confs/0124
@@ -1,13 +1,7 @@
 # Exim test configuration 0124
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0125 b/test/confs/0125
index 9bc55c728ea820a81b2b0aad955dae03ac6556d6..69fe2d6747d90525e84df5f5bf1512aaa689c728 100644 (file)
--- a/test/confs/0125
+++ b/test/confs/0125
@@ -1,13 +1,7 @@
 # Exim test configuration 0125
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0126 b/test/confs/0126
index 8a8474aa3a679718d96ec3ba5f791e7b5117cb7c..5370606080e8e9890a33b10746301d0aac28b4c3 100644 (file)
--- a/test/confs/0126
+++ b/test/confs/0126
@@ -1,14 +1,8 @@
 # Exim test configuration 0126
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0127 b/test/confs/0127
index 33c72e35208766b3518a37a2b6e0dd3aa2f2c046..1906bb430376f5da0369ec6970a5003e816d3f31 100644 (file)
--- a/test/confs/0127
+++ b/test/confs/0127
@@ -1,14 +1,8 @@
 # Exim test configuration 0127
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0128 b/test/confs/0128
index d0e8cc4c42c2a1ea249fbc13367b024117dbb52c..9acfb5e9ddcd16cb001b1ff9c20ff692a502c1bd 100644 (file)
--- a/test/confs/0128
+++ b/test/confs/0128
@@ -1,13 +1,7 @@
 # Exim test configuration 0128
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0129 b/test/confs/0129
index 378a6b9042d06bbf523a22428c25e71d6e82921d..c91b02587093bc13d726f00e3f0bf5a0de2fd940 100644 (file)
--- a/test/confs/0129
+++ b/test/confs/0129
@@ -1,13 +1,7 @@
 # Exim test configuration 0129
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0130 b/test/confs/0130
index 5871fc75f5eb1b488a7d67f0dee2ef520cac9153..02a095358d849d0bb211c7856244467657254483 100644 (file)
--- a/test/confs/0130
+++ b/test/confs/0130
@@ -1,13 +1,7 @@
 # Exim test configuration 0130
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0131 b/test/confs/0131
index 4ca5af5f4cfc0037daf6b20f7c01566a4bdcacfe..c55813e7734c2d2c862a18c9d01c720c9dc68ea2 100644 (file)
--- a/test/confs/0131
+++ b/test/confs/0131
@@ -1,13 +1,7 @@
 # Exim test configuration 0131
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0132 b/test/confs/0132
index 50bce7969c7f94f580577c0f901d3518a86d969f..83bbb3608f12682fc15a3e52e07e880757690427 100644 (file)
--- a/test/confs/0132
+++ b/test/confs/0132
@@ -1,13 +1,7 @@
 # Exim test configuration 0132
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0133 b/test/confs/0133
index 7150db724c446affac2e4cc80755f935a992cc47..bc4e6283f5370b6464bd9e7ecb2d56269d1d151c 100644 (file)
--- a/test/confs/0133
+++ b/test/confs/0133
@@ -1,13 +1,7 @@
 # Exim test configuration 0133
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0134 b/test/confs/0134
index c8f8227b01ba807a664965dfc93398faf7247c30..9530df65273942117c2e4ccd3550015717d39afc 100644 (file)
--- a/test/confs/0134
+++ b/test/confs/0134
@@ -1,13 +1,7 @@
 # Exim test configuration 0134
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0135 b/test/confs/0135
index 913373d8aaaac64869573e6d271c9fed3cf05755..2c62f04732f5c72341cd74aabf83d27ed9f67bf6 100644 (file)
--- a/test/confs/0135
+++ b/test/confs/0135
@@ -1,13 +1,7 @@
 # Exim test configuration 0135
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0136 b/test/confs/0136
index c6bd5f557ccec7555c930da5a1a677750cc23fb1..efc73c58d09de49cb65dc024422eb65065bdc725 100644 (file)
--- a/test/confs/0136
+++ b/test/confs/0136
@@ -2,14 +2,8 @@
 
 BRB=true
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0137 b/test/confs/0137
index b36a701c2dd93910b2c01c83581112137bc76d0e..1a2094ef372227b7de9108bbb32399032cfc66d2 100644 (file)
--- a/test/confs/0137
+++ b/test/confs/0137
@@ -1,13 +1,7 @@
 # Exim test configuration 0137
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0138 b/test/confs/0138
index 9de30ce7dfd63c673fd9332beb1afbb9b82cd993..66539d6b049649db734605eaf14299e195bc715d 100644 (file)
--- a/test/confs/0138
+++ b/test/confs/0138
@@ -1,13 +1,7 @@
 # Exim test configuration 0138
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0139 b/test/confs/0139
index b1a243e425fe7aab74dc117ff254ef97eff239f6..eb3990c7281c54c2430ef748435d265e87e26c9a 100644 (file)
--- a/test/confs/0139
+++ b/test/confs/0139
@@ -1,13 +1,7 @@
 # Exim test configuration 0139
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0140 b/test/confs/0140
index 8ab406add3d940d9be9207c7ce84023e29a9bd48..fbc64b43bccb531d7ab2c6a836c161af7ec1cfb1 100644 (file)
--- a/test/confs/0140
+++ b/test/confs/0140
@@ -1,13 +1,7 @@
 # Exim test configuration 0140
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0141 b/test/confs/0141
index ddb05cd663f6bccdaf681a8085ab2d02859f6a55..96f6ef1122aafed24bce6827679fc74219b0d8e4 100644 (file)
--- a/test/confs/0141
+++ b/test/confs/0141
@@ -1,13 +1,7 @@
 # Exim test configuration 0141
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0142 b/test/confs/0142
index 2e25d4438fcdc077a6cc065a2e58e2a8d39da33b..748e76b8baa6bd5d3209756835a80147fbda6dcb 100644 (file)
--- a/test/confs/0142
+++ b/test/confs/0142
@@ -1,13 +1,7 @@
 # Exim test configuration 0142
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0143 b/test/confs/0143
index a6dfbb61f8ae0361a0db694d21db5ee963ae690c..5a6ee34a956a2a1cc351fcc25c3c9993167400b7 100644 (file)
--- a/test/confs/0143
+++ b/test/confs/0143
@@ -1,14 +1,8 @@
 # Exim test configuration 0143
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0144 b/test/confs/0144
index 3c5c4d03578dedf7d43f1015bc1468393a494122..34b38230f88919c2398092da98f17bb8ffff386e 100644 (file)
--- a/test/confs/0144
+++ b/test/confs/0144
@@ -1,15 +1,9 @@
 # Exim test configuration 0144
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0145 b/test/confs/0145
index f4f96590d835ff056569cd41027ec645334ab960..16b02a8582bb6301978f92ad626fe6f804feb6da 100644 (file)
--- a/test/confs/0145
+++ b/test/confs/0145
@@ -1,15 +1,9 @@
 # Exim test configuration 0145
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0146 b/test/confs/0146
index a0f8a4c404ae4f6a9027e10a0cb3471066802e9d..d8b6067e765e81fbd42ce304d739e8b4ee2e931d 100644 (file)
--- a/test/confs/0146
+++ b/test/confs/0146
@@ -1,15 +1,9 @@
 # Exim test configuration 0146
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0147 b/test/confs/0147
index bf78500f4fe874d656ba2da929af1987e54d6370..996d064be0848515b550179db5ee6a0731e06216 100644 (file)
--- a/test/confs/0147
+++ b/test/confs/0147
@@ -6,16 +6,10 @@ x#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx#xxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ABCD_XYZ = abcdxyz
 ABCD=abcd + ABCD_XYZ
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0148 b/test/confs/0148
index a01bbf26aa9fcc133d9986b8889091e2037d7991..ea31cddbe67b55eb2a1ddfb523858da2964df047 100644 (file)
--- a/test/confs/0148
+++ b/test/confs/0148
@@ -1,15 +1,9 @@
 # Exim test configuration 0148
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0149 b/test/confs/0149
index 30c35b40054f03a6d0c3b033d909e3530904b912..60c742acf90d3048efe76d9f5d4799b4f6fd7b7a 100644 (file)
--- a/test/confs/0149
+++ b/test/confs/0149
@@ -1,15 +1,9 @@
 # Exim test configuration 0149
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+.include DIR/aux-var/std_conf_prefix
+
 qualify_domain = test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 

diff --git a/test/confs/0150 b/test/confs/0150
index 818f1a28b1d35cf86a5e5ed0886b1a93e3428173..dd421a12513ff5f1eb4618d36b3646cd839f9531 100644 (file)
--- a/test/confs/0150
+++ b/test/confs/0150
@@ -1,13 +1,7 @@
 # Exim test configuration 0150
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0151 b/test/confs/0151
index 5c8565e2ef14b94dba33c69fadc9ad2df1fac5a0..d5d17865410c17f0ea34be95df73731b08b7723f 100644 (file)
--- a/test/confs/0151
+++ b/test/confs/0151
@@ -1,13 +1,7 @@
 # Exim test configuration 0151
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0152 b/test/confs/0152
index f8ca251044f85422344f452a3979a0cf460b04fa..7671d52ed3455937d7edaaedf90895dbd5f3acb5 100644 (file)
--- a/test/confs/0152
+++ b/test/confs/0152
@@ -1,13 +1,7 @@
 # Exim test configuration 0152
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0153 b/test/confs/0153
index 171d6f5ac47001e229c2967802a5a4f029ed8be5..c16f88fe95a98f0f58b7f4896350ed4b74c6bc9d 100644 (file)
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -1,13 +1,7 @@
 # Exim test configuration 0153
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0154 b/test/confs/0154
index 3e9006eaa4d23b3fac10f83b9649c16643086c68..bc5ffb89989413321358b753d48a5a70b3fbd442 100644 (file)
--- a/test/confs/0154
+++ b/test/confs/0154
@@ -1,13 +1,7 @@
 # Exim test configuration 0154
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0155 b/test/confs/0155
index 3fe4bb3c6ec0f074c36841b2891242c914f2c8b4..a85ebe5d79c6c9f473a038b1537e530f50e0fe69 100644 (file)
--- a/test/confs/0155
+++ b/test/confs/0155
@@ -1,13 +1,7 @@
 # Exim test configuration 0155
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0156 b/test/confs/0156
index e718552d602e5b4d1239035c19095464a01183b0..d1faa7514fc5b1109c874cadc8820808d973c91c 100644 (file)
--- a/test/confs/0156
+++ b/test/confs/0156
@@ -1,13 +1,7 @@
 # Exim test configuration 0156
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0157 b/test/confs/0157
index 674ed171e873b7b8b7fe520ac9b4475e386078a0..1589f82edcec3efc090162d34c491d881d0de425 100644 (file)
--- a/test/confs/0157
+++ b/test/confs/0157
@@ -1,13 +1,7 @@
 # Exim test configuration 0157
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0158 b/test/confs/0158
index e9001bc278e9fbf2bb79f2ea42f059d15303e796..ccd261e5602dfc3bb87bb06caf00b4e57830ac1e 100644 (file)
--- a/test/confs/0158
+++ b/test/confs/0158
@@ -1,13 +1,7 @@
 # Exim test configuration 0158
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0159 b/test/confs/0159
index d5eb44a7baa88d55f3a5c15d34c56f648df8d24b..e648d9304fe5e00052d981d529fb17de873c3485 100644 (file)
--- a/test/confs/0159
+++ b/test/confs/0159
@@ -2,15 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0160 b/test/confs/0160
index f1ab669d0f9c5d2e6aaa87c169666b2df683a5f3..f6488372916fa5875f3906d627f206cd91a06943 100644 (file)
--- a/test/confs/0160
+++ b/test/confs/0160
@@ -1,14 +1,8 @@
 # Exim test configuration 0160
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0161 b/test/confs/0161
index 3a5626ad9eaacead6a10938179521996f77be1ae..8b91ea053435adede9429458c08925b841669fcc 100644 (file)
--- a/test/confs/0161
+++ b/test/confs/0161
@@ -1,14 +1,8 @@
 # Exim test configuration 0161
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0162 b/test/confs/0162
index d62d8a1c9e17fb37ad20789f7466d5688b635016..0ec376230acb0774ec1933512d40c370f2139572 100644 (file)
--- a/test/confs/0162
+++ b/test/confs/0162
@@ -1,14 +1,8 @@
 # Exim test configuration 0162
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0163 b/test/confs/0163
index 923968659bd723166177bc31043601033fec9259..7b19d9f16b43c523a50241bf6b45c9d1d78258c0 100644 (file)
--- a/test/confs/0163
+++ b/test/confs/0163
@@ -1,14 +1,8 @@
 # Exim test configuration 0163
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0164 b/test/confs/0164
index c81cc617e2c5cdaa06f1cb6aa01075a6b01709e1..6d94efdfd386f98f3f0300c1a13b48c791af73df 100644 (file)
--- a/test/confs/0164
+++ b/test/confs/0164
@@ -1,13 +1,7 @@
 # Exim test configuration 0164
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0165 b/test/confs/0165
index dd9ec9ff148946316cd9577cc5fcde931c1637d9..03e9a825e1279b451c3f2436c5edbce4c07e4370 100644 (file)
--- a/test/confs/0165
+++ b/test/confs/0165
@@ -1,13 +1,7 @@
 # Exim test configuration 0165
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0166 b/test/confs/0166
index 85a75fe9ed2a1fffafbf547e30719219fc5e970a..93489dc56baaefef9c56361d5dd98b8a55b67bf5 100644 (file)
--- a/test/confs/0166
+++ b/test/confs/0166
@@ -1,13 +1,7 @@
 # Exim test configuration 0166
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0167 b/test/confs/0167
index 06b857efc35b7d1d0e5be3a39b7269203f2f928e..a65b9ed65d8851af22fa2073f0bf2d0741f984da 100644 (file)
--- a/test/confs/0167
+++ b/test/confs/0167
@@ -1,13 +1,7 @@
 # Exim test configuration 0167
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0168 b/test/confs/0168
index a16aa98138b4deca731e0b408c35e8de04fec253..196b8e60c331ecb382a96aac304867f849945560 100644 (file)
--- a/test/confs/0168
+++ b/test/confs/0168
@@ -1,13 +1,7 @@
 # Exim test configuration 0168
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0169 b/test/confs/0169
index db212a2e5dfecfa68f8b538d3ceea0ff5e2d4a4f..beafec56d7e886866ad1010fef51de2422e9491c 100644 (file)
--- a/test/confs/0169
+++ b/test/confs/0169
@@ -1,14 +1,8 @@
 # Exim test configuration 0169
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0170 b/test/confs/0170
index 227acdbf2645869a7c175fecb9dc9ce8c5cdff00..5e25e24d813ffa6f7e0ba461c07d69348f5baa93 100644 (file)
--- a/test/confs/0170
+++ b/test/confs/0170
@@ -1,14 +1,8 @@
 # Exim test configuration 0170
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 

diff --git a/test/confs/0171 b/test/confs/0171
index 37f4b5c917cf4c7e16c00a0d6d871f1d3d6569b1..fe4fc2c158939251deba247dabdccd27453989a1 100644 (file)
--- a/test/confs/0171
+++ b/test/confs/0171
@@ -1,13 +1,7 @@
 # Exim test configuration 0171
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0172 b/test/confs/0172
index 96567f25e2c40f0d8034bce82ebcd0525ae8e4f1..9dcc42f811071efcb4586ac625b729c55850229c 100644 (file)
--- a/test/confs/0172
+++ b/test/confs/0172
@@ -1,13 +1,7 @@
 # Exim test configuration 0172
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0173 b/test/confs/0173
index 7fd9179dd2839bbb79d8ebafed851bbc1c67cf4a..1b423e152b57ebe1c637178abcc14e1ec8e4e477 100644 (file)
--- a/test/confs/0173
+++ b/test/confs/0173
@@ -1,13 +1,7 @@
 # Exim test configuration 0173
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0174 b/test/confs/0174
index ece486e34a53c85813df682c52eb267c6d326409..b7fe882e2c4e0cb2cce85bf8f7d413ff0dfe3714 100644 (file)
--- a/test/confs/0174
+++ b/test/confs/0174
@@ -1,13 +1,7 @@
 # Exim test configuration 0174
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0175 b/test/confs/0175
index 838a0736dfd4700913a6f46be1bd9013b594dbf0..b20e4fe1a2d67532bd9382d2b85f2862b09f13b0 100644 (file)
--- a/test/confs/0175
+++ b/test/confs/0175
@@ -1,13 +1,7 @@
 # Exim test configuration 0175
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0176 b/test/confs/0176
index 2b76446f46f305ab05fee139a763f3c198af72e4..81d0b5ddf5705725461e72a2003aa4e43172abd3 100644 (file)
--- a/test/confs/0176
+++ b/test/confs/0176
@@ -1,13 +1,7 @@
 # Exim test configuration 0176
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0177 b/test/confs/0177
index 3bc3ab0248037b166b6b7f88655b3edeaabc9e6c..7921a8b55d4e8600975c19fe14900a9e6df8a5f3 100644 (file)
--- a/test/confs/0177
+++ b/test/confs/0177
@@ -1,13 +1,7 @@
 # Exim test configuration 0177
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 

diff --git a/test/confs/0178 b/test/confs/0178
index e931379304b502a52261e1fa1a49148422a2244b..bdabf6afad18acfd2fa9c246716d2f4fd4700dd4 100644 (file)
--- a/