Include preset config after the default vcl_recv

wodby · Jan 18, 2019 · e5c91eb · e5c91eb
1 parent 0c4aa05
commit e5c91eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/templates/default.vcl.tmpl b/templates/default.vcl.tmpl
@@ -35,15 +35,16 @@ sub vcl_recv {
     }
 }
 
-include "preset.vcl";
-
 include "includes/purge.vcl";
 include "includes/static.vcl";
 include "includes/mobile.vcl";
 
 # See https://book.varnish-software.com/4.0/chapters/VCL_Basics.html
 
 include "defaults/vcl_recv.vcl";
+
+include "preset.vcl";
+
 include "defaults/vcl_hash.vcl";
 include "defaults/vcl_pipe.vcl";
 include "defaults/vcl_backend_response.vcl";

diff --git a/tests/basic/run.sh b/tests/basic/run.sh
@@ -34,7 +34,7 @@ varnish curl --header "X-Forwarded-For: ${us_ip}" -s "localhost:6081" | grep -q
 varnish make flush -f /usr/local/bin/actions.mk
 echo "OK"
 
-echo -n "Checking varnish VC-KEY cookies"
+echo -n "Checking varnish VC-KEY cookies... "
 docker-compose exec php sh -c 'echo "<?php echo(\"Hello World\");" > /var/www/html/index.php'
 varnish sh -c 'curl -sI -b "VCKEYinvalid=123"  localhost:6081 | grep -q "X-VC-Cache: MISS"'
 varnish sh -c 'curl -sI -b "VCKEYinvalid=123"  localhost:6081 | grep -q "X-VC-Cache: MISS"'