* [Buildroot] [PATCH 2/3] package/nginx: add stream ssl preread module
2020-09-20 8:13 [Buildroot] [PATCH 1/3] package/nginx: add stream realip option Fabrice Fontaine
@ 2020-09-20 8:13 ` Fabrice Fontaine
2020-09-20 8:13 ` [Buildroot] [PATCH 3/3] package/nginx: add random modules Fabrice Fontaine
2020-09-20 13:33 ` [Buildroot] [PATCH 1/3] package/nginx: add stream realip option Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2020-09-20 8:13 UTC (permalink / raw)
To: buildroot
stream ssl preread is available since version 1.11.5 and
https://github.com/nginx/nginx/commit/5a7afb1b0d3f74d0ff96d4d9c519c26deb0fde39
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/nginx/Config.in | 5 +++++
package/nginx/nginx.mk | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/package/nginx/Config.in b/package/nginx/Config.in
index 507b4dcfb4..30947e50fe 100644
--- a/package/nginx/Config.in
+++ b/package/nginx/Config.in
@@ -345,6 +345,11 @@ config BR2_PACKAGE_NGINX_STREAM_GEOIP_MODULE
help
Enable ngx_stream_geoip_module
+config BR2_PACKAGE_NGINX_STREAM_SSL_PREREAD_MODULE
+ bool "ngx_stream_ssl_preread_module"
+ help
+ Enable ngx_stream_ssl_preread_module
+
config BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE
bool "ngx_stream_limit_conn_module"
default y
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 2fcdf91b0c..7d9214baff 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -238,6 +238,10 @@ NGINX_DEPENDENCIES += geoip
NGINX_CONF_OPTS += --with-stream_geoip_module
endif
+ifeq ($(BR2_PACKAGE_NGINX_STREAM_SSL_PREREAD_MODULE),y)
+NGINX_CONF_OPTS += --with-stream_ssl_preread_module
+endif
+
NGINX_CONF_OPTS += \
$(if $(BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE),,--without-stream_limit_conn_module) \
$(if $(BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE),,--without-stream_access_module) \
--
2.28.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 3/3] package/nginx: add random modules
2020-09-20 8:13 [Buildroot] [PATCH 1/3] package/nginx: add stream realip option Fabrice Fontaine
2020-09-20 8:13 ` [Buildroot] [PATCH 2/3] package/nginx: add stream ssl preread module Fabrice Fontaine
@ 2020-09-20 8:13 ` Fabrice Fontaine
2020-09-20 13:33 ` [Buildroot] [PATCH 1/3] package/nginx: add stream realip option Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2020-09-20 8:13 UTC (permalink / raw)
To: buildroot
http_upstream and stream_upstream random modules are available since
version 1.15.1 and
https://github.com/nginx/nginx/commit/0c4ccbea23813a50132df511d4445bc1686dbc2f
and are enabled by default, add two options to be able to disable them
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/nginx/Config.in | 12 ++++++++++++
package/nginx/nginx.mk | 2 ++
2 files changed, 14 insertions(+)
diff --git a/package/nginx/Config.in b/package/nginx/Config.in
index 30947e50fe..6ae790a949 100644
--- a/package/nginx/Config.in
+++ b/package/nginx/Config.in
@@ -290,6 +290,12 @@ config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE
help
Enable ngx_http_upstream_keepalive_module
+config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE
+ bool "ngx_http_upstream_random_module"
+ default y
+ help
+ Enable ngx_http_upstream_random_module
+
endif #BR2_PACKAGE_NGINX_HTTP
config BR2_PACKAGE_NGINX_MAIL
@@ -398,6 +404,12 @@ config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE
help
Enable ngx_stream_upstream_least_conn_module
+config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_RANDOM_MODULE
+ bool "ngx_stream_upstream_random_module"
+ default y
+ help
+ Enable ngx_stream_upstream_random_module
+
config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE
bool "ngx_stream_upstream_zone_module"
default y
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 7d9214baff..1f896bc377 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -198,6 +198,7 @@ NGINX_CONF_OPTS += \
$(if $(BR2_PACKAGE_NGINX_HTTP_BROWSER_MODULE),,--without-http_browser_module) \
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_IP_HASH_MODULE),,--without-http_upstream_ip_hash_module) \
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_LEAST_CONN_MODULE),,--without-http_upstream_least_conn_module) \
+ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE),,--without-http_upstream_random_module) \
$(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE),,--without-http_upstream_keepalive_module)
else # !BR2_PACKAGE_NGINX_HTTP
@@ -251,6 +252,7 @@ NGINX_CONF_OPTS += \
$(if $(BR2_PACKAGE_NGINX_STREAM_RETURN_MODULE),,--without-stream_return_module) \
$(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE),,--without-stream_upstream_hash_module) \
$(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE),,--without-stream_upstream_least_conn_module) \
+ $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_RANDOM_MODULE),,--without-stream_upstream_random_module) \
$(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE),,--without-stream_upstream_zone_module)
endif # BR2_PACKAGE_NGINX_STREAM
--
2.28.0
^ permalink raw reply related [flat|nested] 4+ messages in thread