From ddc24f807065dd2b6be74fdae9595d9f87541c63 Mon Sep 17 00:00:00 2001 From: James Strong Date: Wed, 10 Apr 2024 14:26:26 -0400 Subject: [PATCH] add njs to nginx build Signed-off-by: James Strong --- images/nginx-1.25/rootfs/build.sh | 11 ++++++++++- rootfs/etc/nginx/template/nginx.tmpl | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/images/nginx-1.25/rootfs/build.sh b/images/nginx-1.25/rootfs/build.sh index 3fe610945..2c34065c6 100755 --- a/images/nginx-1.25/rootfs/build.sh +++ b/images/nginx-1.25/rootfs/build.sh @@ -109,6 +109,10 @@ export OPENTELEMETRY_CPP_VERSION="v1.11.0" # Check on https://github.com/open-telemetry/opentelemetry-proto export OPENTELEMETRY_PROTO_VERSION="v1.1.0" +# http://hg.nginx.org/njs +export NGINX_NJS_VERSION="0.8.3" + + export BUILD_PATH=/tmp/build ARCH=$(uname -m) @@ -282,6 +286,10 @@ get_src 0fb790e394510e73fdba1492e576aaec0b8ee9ef08e3e821ce253a07719cf7ea \ get_src d74f86ada2329016068bc5a243268f1f555edd620b6a7d6ce89295e7d6cf18da \ "https://github.com/microsoft/mimalloc/archive/${MIMALOC_VERSION}.tar.gz" "mimalloc" + +get_src b7afc0e67cf1be8f9ea4b1e6133026e7fb6b8953fafc947d0778ca48a0aa1e64 \ + "http://hg.nginx.org/njs/archive/${NGINX_NJS_VERSION}.tar.gz" + # improve compilation times CORES=$(($(grep -c ^processor /proc/cpuinfo) - 1)) @@ -489,7 +497,8 @@ WITH_MODULES=" \ --add-dynamic-module=$BUILD_PATH/nginx-http-auth-digest \ --add-dynamic-module=$BUILD_PATH/ModSecurity-nginx \ --add-dynamic-module=$BUILD_PATH/ngx_http_geoip2_module \ - --add-dynamic-module=$BUILD_PATH/ngx_brotli" + --add-dynamic-module=$BUILD_PATH/ngx_brotli \ + --add-module=$BUILD_PATH/njs" ./configure \ --prefix=/usr/local/nginx \ diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index 4c0da2eb9..f3e356993 100644 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -33,6 +33,10 @@ load_module /etc/nginx/modules/ngx_http_modsecurity_module.so; load_module /etc/nginx/modules/otel_ngx_module.so; {{ end }} +{{ if $cfg.EnableNJS }} +load_module /etc/nginx/modules/ngx_http_js_module.so; +{{ end }} + daemon off; worker_processes {{ $cfg.WorkerProcesses }};