diff --git a/nginx-autoinstall.sh b/nginx-autoinstall.sh index a65f5b99..0ffffa65 100755 --- a/nginx-autoinstall.sh +++ b/nginx-autoinstall.sh @@ -189,8 +189,9 @@ case $OPTION in # Dependencies apt-get update - apt-get install -y build-essential ca-certificates wget curl libpcre3 libpcre3-dev autoconf unzip automake libtool tar git libssl-dev zlib1g-dev uuid-dev lsb-release libxml2-dev libxslt1-dev cmake - + apt-get install -qy apt-utils m4 build-essential ca-certificates wget curl libpcre3 libpcre3-dev autoconf unzip automake libtool tar git libssl-dev zlib1g-dev uuid-dev lsb-release libxml2-dev libxslt1-dev cmake + apt-get update + if [[ $MODSEC == 'y' ]]; then apt-get install -y apt-utils libcurl4-openssl-dev libgeoip-dev liblmdb-dev libpcre++-dev libyajl-dev pkgconf fi @@ -198,11 +199,10 @@ case $OPTION in # PageSpeed if [[ $PAGESPEED == 'y' ]]; then cd /usr/local/src/nginx/modules || exit 1 - wget https://github.com/pagespeed/ngx_pagespeed/archive/v${NPS_VER}-stable.zip - unzip v${NPS_VER}-stable.zip - cd incubator-pagespeed-ngx-${NPS_VER}-stable || exit 1 - psol_url=https://dl.google.com/dl/page-speed/psol/${NPS_VER}.tar.gz - [ -e scripts/format_binary_url.sh ] && psol_url=$(scripts/format_binary_url.sh PSOL_BINARY_URL) + wget https://github.com/apache/incubator-pagespeed-ngx/archive/v1.14.33.1-RC1.zip + unzip v1.14.33.1-RC1.zip + cd incubator-pagespeed-ngx-1.14.33.1-RC1 || exit 1 + psol_url=https://dist.apache.org/repos/dist/release/incubator/pagespeed/1.14.36.1/x64/psol-1.14.36.1-apache-incubating-x64.tar.gz wget "${psol_url}" tar -xzvf "$(basename "${psol_url}")" fi @@ -396,6 +396,7 @@ case $OPTION in echo "$NGINX_MODULES" echo "--add-module=/usr/local/src/nginx/modules/incubator-pagespeed-ngx-${NPS_VER}-stable" ) + fi if [[ $BROTLI == 'y' ]]; then