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/0290 | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/confs/0290')
| -rw-r--r-- | test/confs/0290 | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/test/confs/0290 b/test/confs/0290 index 57e328216..5ccb8451f 100644 --- a/test/confs/0290 +++ b/test/confs/0290 @@ -3,27 +3,22 @@ FOOBAR= FOO=inc1 BAR=.include "DIR/aux-fixed/TESTNUM.inc2" -RT = receive_timeout = 1s +OPT = receive_timeout = 1s INC= C1=# C2=# C1C2 this should be a comment -exim_path = EXIM_PATH -host_lookup_order = bydns -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 = +.include DIR/aux-var/std_conf_prefix + trusted_users = CALLER +primary_hostname = myhost.test.ex # ----- Main settings ----- FOOBAR .include DIR/aux-fixed/TESTNUM.FOO -RT +OPT INC remote_sort_domains = a:b:c |