From 3fa2a334121f842f0d200f60fe034e252048a251 Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Wed, 31 Jul 2019 16:40:19 +0200
Subject: [PATCH] [TESTS] new sed pattern / Multiple Vhosts Includes REF: #285

---
 .dev-tools/setup-ngxblocker/setup-ngxblocker | 3 ++-
 .dev-tools/test-setupngxblocker.sh           | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.dev-tools/setup-ngxblocker/setup-ngxblocker b/.dev-tools/setup-ngxblocker/setup-ngxblocker
index 5a379a551..dd3d74a0f 100644
--- a/.dev-tools/setup-ngxblocker/setup-ngxblocker
+++ b/.dev-tools/setup-ngxblocker/setup-ngxblocker
@@ -439,7 +439,8 @@ main() {
 
 	# update vhosts
 	for file in $FILE_LIST; do
-		line=$(find_includes $file include last server_ last location first )
+		#line=$(find_includes $file include last server_ last location first )
+		line=$(sed -n '/server_/,/}/p' $file)
 
 		if [ -n "$(check_wildcard $file $BOTS_DIR)" ]; then
 			# do not use wildcards in vhost files
diff --git a/.dev-tools/test-setupngxblocker.sh b/.dev-tools/test-setupngxblocker.sh
index 034251f60..1041e92fd 100755
--- a/.dev-tools/test-setupngxblocker.sh
+++ b/.dev-tools/test-setupngxblocker.sh
@@ -157,8 +157,8 @@ sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -x -m
 
 setup_ansible1 () {
 sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.conf ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost
-#sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -v ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ -x -e vhost    
-sed -i '/server_.*/a\\n### NGINX BOT BLOCKER INCLUDE\ninclude /etc/nginx/bots.d/blockbots.conf;\n' ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost
+sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -v ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ -x -e vhost    
+#sed -i '/server_.*/a\\n### NGINX BOT BLOCKER INCLUDE\ninclude /etc/nginx/bots.d/blockbots.conf;\n' ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost
 }
 
 # -----------------