diff --git a/changelog.md b/changelog.md index 5632ba24..c465f301 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [x.x.x] - xxxx-xx-xx +### Added +- [scripts/build_nginx] Add njs module + ### Changes - [cedar-14] Removed - rename master branch to main diff --git a/nginx-heroku-16.tgz b/nginx-heroku-16.tgz index ebe4dbea..40d8eb43 100644 Binary files a/nginx-heroku-16.tgz and b/nginx-heroku-16.tgz differ diff --git a/nginx-heroku-18.tgz b/nginx-heroku-18.tgz index 92eb6340..83ca198c 100644 Binary files a/nginx-heroku-18.tgz and b/nginx-heroku-18.tgz differ diff --git a/nginx-heroku-20.tgz b/nginx-heroku-20.tgz index 41dc241f..25099c92 100644 Binary files a/nginx-heroku-20.tgz and b/nginx-heroku-20.tgz differ diff --git a/scripts/build_nginx b/scripts/build_nginx index 5c08fca7..97066649 100755 --- a/scripts/build_nginx +++ b/scripts/build_nginx @@ -9,12 +9,14 @@ PCRE_VERSION=${PCRE_VERSION-8.44} HEADERS_MORE_VERSION=${HEADERS_MORE_VERSION-0.33} ZLIB_VERSION=${ZLIB_VERSION-1.2.11} UUID4_VERSION=${UUID4_VERSION-master} +NJS_VERSION=${NJS_VERSION-0.5.3} nginx_tarball_url=https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz pcre_tarball_url=https://ftp.pcre.org/pub/pcre/pcre-${PCRE_VERSION}.tar.gz headers_more_nginx_module_url=https://github.com/openresty/headers-more-nginx-module/archive/v${HEADERS_MORE_VERSION}.tar.gz uuid4_url=https://github.com/cybozu/nginx-uuid4-module/archive/${UUID4_VERSION}.tar.gz zlib_url=http://zlib.net/zlib-${ZLIB_VERSION}.tar.gz +njs_url=https://github.com/nginx/njs/archive/${NJS_VERSION}.tar.gz temp_dir=$(mktemp -d /tmp/nginx.XXXXXXXXXX) @@ -36,6 +38,10 @@ echo "Downloading $zlib_url" echo "Downloading $uuid4_url" (cd nginx-${NGINX_VERSION} && curl -L $uuid4_url | tar xvz ) +echo "Downloading $njs_url" +(cd nginx-${NGINX_VERSION} && curl -L $njs_url | tar xvz ) +ls -l ${temp_dir}/nginx-${NGINX_VERSION} + # This will build `nginx` ( cd nginx-${NGINX_VERSION} @@ -47,7 +53,8 @@ echo "Downloading $uuid4_url" --with-http_ssl_module \ --prefix=/tmp/nginx \ --add-module=${temp_dir}/nginx-${NGINX_VERSION}/headers-more-nginx-module-${HEADERS_MORE_VERSION} \ - --add-module=${temp_dir}/nginx-${NGINX_VERSION}/nginx-uuid4-module-${UUID4_VERSION} + --add-module=${temp_dir}/nginx-${NGINX_VERSION}/nginx-uuid4-module-${UUID4_VERSION} \ + --add-module=${temp_dir}/nginx-${NGINX_VERSION}/njs-${NJS_VERSION}/nginx make install ) @@ -63,7 +70,8 @@ echo "Downloading $uuid4_url" --with-http_ssl_module \ --prefix=/tmp/nginx-debug \ --add-module=${temp_dir}/nginx-${NGINX_VERSION}/headers-more-nginx-module-${HEADERS_MORE_VERSION} \ - --add-module=${temp_dir}/nginx-${NGINX_VERSION}/nginx-uuid4-module-${UUID4_VERSION} + --add-module=${temp_dir}/nginx-${NGINX_VERSION}/nginx-uuid4-module-${UUID4_VERSION} \ + --add-module=${temp_dir}/nginx-${NGINX_VERSION}/njs-${NJS_VERSION}/nginx make install )