Merge pull request #135 from UKHomeOffice/openresty-1.19.3.2

Patch OpenResty to 1.19.3.2

build.sh

@@ -13,7 +13,7 @@ GEOIP_UPDATE_CLI='https://github.com/maxmind/geoipupdate/releases/download/v4.7.
 GEOIP_URL='https://github.com/maxmind/libmaxminddb/releases/download/1.6.0/libmaxminddb-1.6.0.tar.gz'
 LUAROCKS_URL='https://luarocks.github.io/luarocks/releases/luarocks-3.7.0.tar.gz'
 NAXSI_URL='https://github.com/nbs-system/naxsi/archive/1.3.tar.gz'
-OPEN_RESTY_URL='http://openresty.org/download/openresty-1.19.3.1.tar.gz'
+OPEN_RESTY_URL='http://openresty.org/download/openresty-1.19.3.2.tar.gz'
 STATSD_URL='https://github.com/UKHomeOffice/nginx-statsd/archive/0.0.1-ngxpatch.tar.gz'
 
 MAXMIND_PATH='/usr/share/GeoIP'

ci-build.sh

@@ -228,27 +228,27 @@ wget -O /dev/null --quiet --no-check-certificate https://${DOCKER_HOST_NAME}:${P
 
 
 start_test "Start with multi locations settings" "${STD_CMD} \
-           -e \"LOCATIONS_CSV=/,/news\" \
-           -e \"PROXY_SERVICE_HOST_1=http://www.w3.org\" \
-           -e \"PROXY_SERVICE_PORT_1=80\" \
-           -e \"PROXY_SERVICE_HOST_2=http://www.bbc.co.uk\" \
-           -e \"PROXY_SERVICE_PORT_2=80\""
+           -e \"LOCATIONS_CSV=/,/wiki/Wikipedia:About\" \
+           -e \"PROXY_SERVICE_HOST_1=https://www.w3.org\" \
+           -e \"PROXY_SERVICE_PORT_1=443\" \
+           -e \"PROXY_SERVICE_HOST_2=https://en.wikipedia.org\" \
+           -e \"PROXY_SERVICE_PORT_2=443\""
 
 
 echo "Test for location 1 @ /..."
 wget -O /dev/null --quiet --no-check-certificate https://${DOCKER_HOST_NAME}:${PORT}/
-echo "Test for news..."
-wget -O /dev/null --quiet --no-check-certificate --header="Host: www.bbc.co.uk" https://${DOCKER_HOST_NAME}:${PORT}/news
+echo "Test for wikipedia about page..."
+wget -O /dev/null --quiet --no-check-certificate --header="Host: en.wikipedia.org" https://${DOCKER_HOST_NAME}:${PORT}/wiki/Wikipedia:About
 
 start_test "Start with Multiple locations, single proxy and NAXSI download." "${STD_CMD} \
-           -e \"PROXY_SERVICE_HOST=http://www.bbc.co.uk\" \
-           -e \"PROXY_SERVICE_PORT=80\" \
-           -e \"LOCATIONS_CSV=/,/news\" \
+           -e \"PROXY_SERVICE_HOST=https://en.wikipedia.org\" \
+           -e \"PROXY_SERVICE_PORT=443\" \
+           -e \"LOCATIONS_CSV=/,/wiki/Wikipedia:About\" \
            -e \"NAXSI_RULES_URL_CSV_1=https://raw.githubusercontent.com/nbs-system/naxsi-rules/master/drupal.rules\" \
            -e \"NAXSI_RULES_MD5_CSV_1=3b3c24ed61683ab33d8441857c315432\""
 
 echo "Test for all OK..."
-wget -O /dev/null --quiet --no-check-certificate --header="Host: www.bbc.co.uk" https://${DOCKER_HOST_NAME}:${PORT}/
+wget -O /dev/null --quiet --no-check-certificate --header="Host: en.wikipedia.org" https://${DOCKER_HOST_NAME}:${PORT}/
 
 echo "Test client certs..."
 cd ./client_certs/