diff --git a/bin/nginx-cedar b/bin/nginx-cedar index ab924a91..5573d7ae 100755 Binary files a/bin/nginx-cedar and b/bin/nginx-cedar differ diff --git a/bin/nginx-cedar-14 b/bin/nginx-cedar-14 index 9065133c..5573d7ae 100755 Binary files a/bin/nginx-cedar-14 and b/bin/nginx-cedar-14 differ diff --git a/scripts/build_nginx.sh b/scripts/build_nginx.sh index 05702549..eafc834c 100755 --- a/scripts/build_nginx.sh +++ b/scripts/build_nginx.sh @@ -9,13 +9,13 @@ # Once the dyno has is 'up' you can open your browser and navigate # this dyno's directory structure to download the nginx binary. -NGINX_VERSION=${NGINX_VERSION-1.5.7} -PCRE_VERSION=${PCRE_VERSION-8.21} -HEADERS_MORE_VERSION=${HEADERS_MORE_VERSION-0.23} +NGINX_VERSION=${NGINX_VERSION-1.7.9} +PCRE_VERSION=${PCRE_VERSION-8.35} +HEADERS_MORE_VERSION=${HEADERS_MORE_VERSION-0.25} nginx_tarball_url=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz -pcre_tarball_url=http://garr.dl.sourceforge.net/project/pcre/pcre/${PCRE_VERSION}/pcre-${PCRE_VERSION}.tar.bz2 -headers_more_nginx_module_url=https://github.com/agentzh/headers-more-nginx-module/archive/v${HEADERS_MORE_VERSION}.tar.gz +pcre_tarball_url=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PCRE_VERSION}.tar.bz2 +headers_more_nginx_module_url=https://github.com/openresty/headers-more-nginx-module/archive/v${HEADERS_MORE_VERSION}.tar.gz temp_dir=$(mktemp -d /tmp/nginx.XXXXXXXXXX) @@ -36,16 +36,16 @@ echo "Downloading $headers_more_nginx_module_url" (cd nginx-${NGINX_VERSION} && curl -L $headers_more_nginx_module_url | tar xvz ) ( - cd nginx-${NGINX_VERSION} - ./configure \ - --with-pcre=pcre-${PCRE_VERSION} \ - --prefix=/tmp/nginx \ - --add-module=/${temp_dir}/nginx-${NGINX_VERSION}/headers-more-nginx-module-${HEADERS_MORE_VERSION} - make install + cd nginx-${NGINX_VERSION} + ./configure \ + --with-pcre=pcre-${PCRE_VERSION} \ + --prefix=/tmp/nginx \ + --add-module=/${temp_dir}/nginx-${NGINX_VERSION}/headers-more-nginx-module-${HEADERS_MORE_VERSION} + make install ) while true do - sleep 1 - echo "." + sleep 1 + echo "." done