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/0557 | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/confs/0557')
| -rw-r--r-- | test/confs/0557 | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/test/confs/0557 b/test/confs/0557 index 3c5d55197..9b7dec2e6 100644 --- a/test/confs/0557 +++ b/test/confs/0557 @@ -1,18 +1,13 @@ # Exim test configuration 0557 -X= -Y= +FAKE= +OPT= HOSTS= HAI= -exim_path = EXIM_PATH -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 ----- @@ -24,8 +19,8 @@ begin routers r1: driver = manualroute route_list = * HOSTS -X host_find_failed = ignore -Y host_all_ignored = HAI +FAKE host_find_failed = ignore +OPT host_all_ignored = HAI no_more self = send transport = t1 |