From 68e7eff2a3fc29a0a226a63dcf27f73ae960c33e Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Mon, 1 Jul 2019 16:22:34 +0200 Subject: [PATCH] Distro Test - Ubuntu 18.04.2 LTS Tests install-ngxblocker and setup-ngxblocker on Nginx for Ubuntu 18.04.2 LTS using default nginx.conf and modified nginx.conf REF: #256 REF: #266 --- .dev-tools/distribution-tests.sh | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/.dev-tools/distribution-tests.sh b/.dev-tools/distribution-tests.sh index b1e5cb6e7..e57a87c90 100755 --- a/.dev-tools/distribution-tests.sh +++ b/.dev-tools/distribution-tests.sh @@ -82,8 +82,8 @@ echo "${bold}${magenta}-----------------------------------------------" printf "\n" cd /usr/sbin # Reset Test -sudo rsync -avzh ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests/unmodified/ubuntu-18.04/ ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests/ubuntu-18.04/ -sudo bash ./install-ngxblocker -x -c ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests/ubuntu-18.04/etc/nginx/conf.d -b ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests/ubuntu-18.04/etc/nginx/bots.d +sudo rsync -avzh ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_default/unmodified/ubuntu-18.04/ ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_default/ubuntu-18.04/ +sudo bash ./install-ngxblocker -x -c ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/conf.d -b ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/bots.d } setupngxblocker_ubuntu_1804 () { @@ -93,7 +93,28 @@ echo "${bold}${magenta}Execute setup-ngxblocker - Ubuntu 18.04.2 LTS" echo "${bold}${magenta}---------------------------------------------" printf "\n" cd /usr/sbin -sudo bash ./setup-ngxblocker -x -c ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests/ubuntu-18.04/etc/nginx/conf.d -b ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests/ubuntu-18.04/etc/nginx/bots.d +sudo bash ./setup-ngxblocker -x -c ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/conf.d -b ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_default/ubuntu-18.04/etc/nginx/bots.d +} + +installngxblocker_ubuntu_1804_NI () { +echo "${bold}${magenta}-----------------------------------------------" +echo "${bold}${magenta}Execute install-ngxblocker - Ubuntu 18.04.2 LTS" +echo "${bold}${magenta}-----------------------------------------------" +printf "\n" +cd /usr/sbin +# Reset Test +sudo rsync -avzh ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_missing_includes/unmodified/ubuntu-18.04/ ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/ +sudo bash ./install-ngxblocker -x -c ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/conf.d -b ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/bots.d +} + +setupngxblocker_ubuntu_1804_NI () { +printf "\n" +echo "${bold}${magenta}---------------------------------------------" +echo "${bold}${magenta}Execute setup-ngxblocker - Ubuntu 18.04.2 LTS" +echo "${bold}${magenta}---------------------------------------------" +printf "\n" +cd /usr/sbin +sudo bash ./setup-ngxblocker -x -c ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/conf.d -b ${TRAVIS_BUILD_DIR}/.dev-tools/distribution_tests_missing_includes/ubuntu-18.04/etc/nginx/bots.d } backupConfFiles () { @@ -111,6 +132,8 @@ printf "\n" installngxblocker_ubuntu_1804 setupngxblocker_ubuntu_1804 +installngxblocker_ubuntu_1804_NI +setupngxblocker_ubuntu_1804_NI # ---------------------- # Exit With Error Number