From b2e0c230433acf4e144905cc98cb2d70155540b8 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Sat, 29 Jun 2019 20:09:57 +0200 Subject: [PATCH] FXI Install Nginx Mainline PPA - Copy nginx.conf into place --- .dev-tools/install-nginx-mainline-ppa.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.dev-tools/install-nginx-mainline-ppa.sh b/.dev-tools/install-nginx-mainline-ppa.sh index 3b94814fa..611db2dd7 100755 --- a/.dev-tools/install-nginx-mainline-ppa.sh +++ b/.dev-tools/install-nginx-mainline-ppa.sh @@ -247,6 +247,14 @@ getnginxversion () { sudo nginx -v &> ${TRAVIS_BUILD_DIR}/.dev-tools/nginxv2.txt } +copyNginxConf () { +printf "\n" +echo "${bold}${magenta}------------------------------" +echo "${bold}${magenta}Copy nginx.conf to /etc/nginx/" +echo "${bold}${magenta}------------------------------" +sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/test_units/nginx.conf-newformat /etc/nginx/nginx.conf +} + # ----------------- # Trigger Functions # ----------------- @@ -275,6 +283,7 @@ runsetupngxblocker1 reloadNginX waitforReload activateLatestBlacklist +copyNginxConf runsetupngxblocker1 reloadNginX waitforReload