diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
| commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
| tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/confs/0259 | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/confs/0259')
| -rw-r--r-- | test/confs/0259 | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/test/confs/0259 b/test/confs/0259 index e5a42dd4a..6b9bc29ab 100644 --- a/test/confs/0259 +++ b/test/confs/0259 @@ -1,14 +1,9 @@ # Exim test configuration 0259 -exim_path = EXIM_PATH -host_lookup_order = bydns -primary_hostname = myhost.test.ex +.include DIR/aux-var/std_conf_prefix + rfc1413_query_timeout = 5s -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 ----- |