Mailing List Archive

commit d6438356906c8048a275894d33fa6b4893e1b135
Author: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sat May 23 07:15:59 2020 +0000

Fix this test for FreeBSD Jail use.

diff --git a/bin/varnishtest/tests/h00006.vtc b/bin/varnishtest/tests/h00006.vtc
index 1844b7b19..556cd6d05 100644
--- a/bin/varnishtest/tests/h00006.vtc
+++ b/bin/varnishtest/tests/h00006.vtc
@@ -1,6 +1,6 @@
varnishtest "haproxy tcp-mode, uds, send-proxy-v2, client ip and acl"

-# same as h00007.vtc, but usinguds for haproxy->varnish
+# same as h00007.vtc, but using uds for haproxy->varnish

feature ignore_unknown_macro

@@ -11,6 +11,18 @@ server s1 {
txresp -body "s1 >>> Hello world!"
} -start

+haproxy h1 -D -conf {
+ defaults
+ mode tcp
+ timeout connect 5s
+ timeout server 30s
+ timeout client 30s
+
+ listen ssloff
+ bind "fd@${fe1}"
+ server v1 ${tmpdir}/v1.sock send-proxy-v2
+} -start
+
varnish v1 -arg "-a ${tmpdir}/v1.sock,PROXY" -vcl+backend {
import std;

@@ -18,6 +30,8 @@ varnish v1 -arg "-a ${tmpdir}/v1.sock,PROXY" -vcl+backend {
"localhost";
"127.0.0.1";
"::1";
+ "${s1_addr}"; // Jails IPv4 address
+ "${h1_fe1_addr}"; // Jails IPv6 address
}

sub vcl_deliver {
@@ -31,18 +45,6 @@ varnish v1 -arg "-a ${tmpdir}/v1.sock,PROXY" -vcl+backend {
}
} -start

-haproxy h1 -D -conf {
- defaults
- mode tcp
- timeout connect 5s
- timeout server 30s
- timeout client 30s
-
- listen ssloff
- bind "fd@${fe1}"
- server v1 ${tmpdir}/v1.sock send-proxy-v2
-} -start
-
client c1 -connect ${h1_fe1_sock} {
txreq -url "/"
rxresp
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit