njs updated to 0.1.0.
diff --git a/debian/extra/njs-0.1.0.tar.gz b/debian/extra/njs-0.1.0.tar.gz new file mode 100644 index 0000000..0936c99 --- /dev/null +++ b/debian/extra/njs-0.1.0.tar.gz Binary files differ
diff --git a/debian/extra/njs-ef2b708510b1.tar.gz b/debian/extra/njs-ef2b708510b1.tar.gz deleted file mode 100644 index a4c42b7..0000000 --- a/debian/extra/njs-ef2b708510b1.tar.gz +++ /dev/null Binary files differ
diff --git a/debian/nginx-module-njs.install b/debian/nginx-module-njs.install index 7510377..5d8c8de 100644 --- a/debian/nginx-module-njs.install +++ b/debian/nginx-module-njs.install
@@ -1,2 +1,4 @@ objs/ngx_http_js_module.so usr/lib/nginx/modules objs/ngx_http_js_module-debug.so usr/lib/nginx/modules +objs/ngx_stream_js_module.so usr/lib/nginx/modules +objs/ngx_stream_js_module-debug.so usr/lib/nginx/modules
diff --git a/debian/nginx-module-njs.preinst b/debian/nginx-module-njs.preinst index 44c617d..7bf8358 100644 --- a/debian/nginx-module-njs.preinst +++ b/debian/nginx-module-njs.preinst
@@ -5,13 +5,14 @@ cat <<BANNER ---------------------------------------------------------------------- -The nJScript dynamic module for nginx has been installed. -To enable this module, add the following to /etc/nginx/nginx.conf +The nJScript dynamic modules for nginx have been installed. +To enable those modules, add the following to /etc/nginx/nginx.conf and reload nginx: load_module modules/ngx_http_js_module.so; + load_module modules/ngx_stream_js_module.so; -Please refer to the module documentation for further details: +Please refer to the modules documentation for further details: https://www.nginx.com/resources/wiki/nginScript/ ----------------------------------------------------------------------
diff --git a/debian/nginx-module-njs.version b/debian/nginx-module-njs.version index 29c4780..f27cb76 100644 --- a/debian/nginx-module-njs.version +++ b/debian/nginx-module-njs.version
@@ -1 +1 @@ -1.11.2.0.0.20160705.ef2b708510b1-1 +1.11.2.0.1.0-1
diff --git a/debian/rules b/debian/rules index 16b7fa3..fd8b44a 100755 --- a/debian/rules +++ b/debian/rules
@@ -43,7 +43,7 @@ --with-http_image_filter_module=dynamic \ --with-http_geoip_module=dynamic \ --with-http_perl_module=dynamic \ - --add-dynamic-module=debian/extra/njs-ef2b708510b1/nginx \ + --add-dynamic-module=debian/extra/njs-0.1.0/nginx \ --with-threads \ --with-stream \ --with-stream_ssl_module \ @@ -74,6 +74,7 @@ mv objs/ngx_http_perl_module.so objs/ngx_http_perl_module-debug.so mv objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so objs/src/http/modules/perl/blib/arch/auto/nginx/nginx-debug.so mv objs/ngx_http_js_module.so objs/ngx_http_js_module-debug.so + mv objs/ngx_stream_js_module.so objs/ngx_stream_js_module-debug.so mv objs/ngx_stream_geoip_module.so objs/ngx_stream_geoip_module-debug.so CFLAGS="" ./configure $(COMMON_CONFIGURE_ARGS) dh_auto_build
diff --git a/rpm/SOURCES/njs-0.1.0.tar.gz b/rpm/SOURCES/njs-0.1.0.tar.gz new file mode 100644 index 0000000..0936c99 --- /dev/null +++ b/rpm/SOURCES/njs-0.1.0.tar.gz Binary files differ
diff --git a/rpm/SOURCES/njs-ef2b708510b1.tar.gz b/rpm/SOURCES/njs-ef2b708510b1.tar.gz deleted file mode 100644 index a4c42b7..0000000 --- a/rpm/SOURCES/njs-ef2b708510b1.tar.gz +++ /dev/null Binary files differ
diff --git a/rpm/SPECS/nginx.spec b/rpm/SPECS/nginx.spec index 6fcfd2d..9b46378 100644 --- a/rpm/SPECS/nginx.spec +++ b/rpm/SPECS/nginx.spec
@@ -62,6 +62,7 @@ %define main_version 1.11.2 %define main_release 1%{?dist}.ngx +%define njs_version 0.1.0 %define module_xslt_version %{main_version} %define module_xslt_release 1%{?dist}.ngx %define module_geoip_version %{main_version} @@ -70,8 +71,7 @@ %define module_image_filter_release 1%{?dist}.ngx %define module_perl_version %{main_version} %define module_perl_release 1%{?dist}.ngx -%define module_njs_shaid ef2b708510b1 -%define module_njs_version %{main_version}.0.0.20160705.%{module_njs_shaid} +%define module_njs_version %{main_version}.%{njs_version} %define module_njs_release 1%{?dist}.ngx %define bdir %{_builddir}/%{name}-%{main_version} @@ -111,7 +111,7 @@ --with-http_image_filter_module=dynamic \ --with-http_geoip_module=dynamic \ --with-http_perl_module=dynamic \ - --add-dynamic-module=njs-%{module_njs_shaid}/nginx \ + --add-dynamic-module=njs-%{njs_version}/nginx \ --with-threads \ --with-stream \ --with-stream_ssl_module \ @@ -143,7 +143,7 @@ Source10: nginx.suse.logrotate Source11: nginx-debug.service Source12: COPYRIGHT -Source13: njs-%{module_njs_shaid}.tar.gz +Source13: njs-%{njs_version}.tar.gz License: 2-clause BSD-like license @@ -237,6 +237,8 @@ %{bdir}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx-debug.so %{__mv} %{bdir}/objs/ngx_http_js_module.so \ %{bdir}/objs/ngx_http_js_module-debug.so +%{__mv} %{bdir}/objs/ngx_stream_js_module.so \ + %{bdir}/objs/ngx_stream_js_module-debug.so %{__mv} %{bdir}/objs/ngx_stream_geoip_module.so \ %{bdir}/objs/ngx_stream_geoip_module-debug.so ./configure %{COMMON_CONFIGURE_ARGS} \ @@ -326,6 +328,8 @@ $RPM_BUILD_ROOT%{perl_vendorarch}/auto/nginx/nginx-debug.so %{__install} -m644 %{bdir}/objs/ngx_http_js_module-debug.so \ $RPM_BUILD_ROOT%{_libdir}/nginx/modules/ngx_http_js_module-debug.so +%{__install} -m644 %{bdir}/objs/ngx_stream_js_module-debug.so \ + $RPM_BUILD_ROOT%{_libdir}/nginx/modules/ngx_stream_js_module-debug.so %{__install} -m644 %{bdir}/objs/ngx_stream_geoip_module-debug.so \ $RPM_BUILD_ROOT%{_libdir}/nginx/modules/ngx_stream_geoip_module-debug.so @@ -403,6 +407,8 @@ %files module-njs %attr(0644,root,root) %{_libdir}/nginx/modules/ngx_http_js_module.so %attr(0644,root,root) %{_libdir}/nginx/modules/ngx_http_js_module-debug.so +%attr(0644,root,root) %{_libdir}/nginx/modules/ngx_stream_js_module.so +%attr(0644,root,root) %{_libdir}/nginx/modules/ngx_stream_js_module-debug.so %pre # Add the "nginx" user @@ -533,13 +539,14 @@ cat <<BANNER ---------------------------------------------------------------------- -The nJScript dynamic module for nginx has been installed. -To enable this module, add the following to /etc/nginx/nginx.conf +The nJScript dynamic modules for nginx have been installed. +To enable those modules, add the following to /etc/nginx/nginx.conf and reload nginx: load_module modules/ngx_http_js_module.so; + load_module modules/ngx_stream_js_module.so; -Please refer to the module documentation for further details: +Please refer to the modules documentation for further details: https://www.nginx.com/resources/wiki/nginScript/ ----------------------------------------------------------------------