* [Buildroot] [PATCH 2/4] package/nginx: add stream return option
2020-06-22 19:31 [Buildroot] [PATCH 1/4] package/nginx: add stream map option Fabrice Fontaine
@ 2020-06-22 19:31 ` Fabrice Fontaine
2020-06-22 19:31 ` [Buildroot] [PATCH 3/4] package/nginx: add stream geo option Fabrice Fontaine
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2020-06-22 19:31 UTC (permalink / raw)
To: buildroot
stream return module has been added in version 1.11.2 with
https://github.com/nginx/nginx/commit/a7c6f8c1d7cb817bf84b639ee0933f9ffed05275
and is enabled by default, add an option to be able to disable it
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/nginx/Config.in | 6 ++++++
package/nginx/nginx.mk | 1 +
2 files changed, 7 insertions(+)
diff --git a/package/nginx/Config.in b/package/nginx/Config.in
index 64406664d3..cad5903882 100644
--- a/package/nginx/Config.in
+++ b/package/nginx/Config.in
@@ -352,6 +352,12 @@ config BR2_PACKAGE_NGINX_STREAM_MAP_MODULE
help
Enable ngx_stream_map_module
+config BR2_PACKAGE_NGINX_STREAM_RETURN_MODULE
+ bool "ngx_stream_return_module"
+ default y
+ help
+ Enable ngx_stream_return_module
+
config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE
bool "ngx_stream_upstream_hash_module"
default y
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 22ee851454..3289382027 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -233,6 +233,7 @@ 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) \
$(if $(BR2_PACKAGE_NGINX_STREAM_MAP_MODULE),,--without-stream_map_module) \
+ $(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_ZONE_MODULE),,--without-stream_upstream_zone_module)
--
2.26.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 3/4] package/nginx: add stream geo option
2020-06-22 19:31 [Buildroot] [PATCH 1/4] package/nginx: add stream map option Fabrice Fontaine
2020-06-22 19:31 ` [Buildroot] [PATCH 2/4] package/nginx: add stream return option Fabrice Fontaine
@ 2020-06-22 19:31 ` Fabrice Fontaine
2020-06-22 19:31 ` [Buildroot] [PATCH 4/4] package/nginx: add stream geoip support Fabrice Fontaine
2020-06-22 20:45 ` [Buildroot] [PATCH 1/4] package/nginx: add stream map option Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2020-06-22 19:31 UTC (permalink / raw)
To: buildroot
stream geo module has been added in version 1.11.3 with
https://github.com/nginx/nginx/commit/bb790f5d30025b634673fcb9939ded5b0c60301f
and is enabled by default, add an option to be able to disable it
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/nginx/Config.in | 6 ++++++
package/nginx/nginx.mk | 1 +
2 files changed, 7 insertions(+)
diff --git a/package/nginx/Config.in b/package/nginx/Config.in
index cad5903882..09af4680ee 100644
--- a/package/nginx/Config.in
+++ b/package/nginx/Config.in
@@ -346,6 +346,12 @@ config BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE
help
Enable ngx_stream_access_module
+config BR2_PACKAGE_NGINX_STREAM_GEO_MODULE
+ bool "ngx_stream_geo_module"
+ default y
+ help
+ Enable ngx_stream_geo_module
+
config BR2_PACKAGE_NGINX_STREAM_MAP_MODULE
bool "ngx_stream_map_module"
default y
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 3289382027..7edc32613b 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -232,6 +232,7 @@ 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) \
+ $(if $(BR2_PACKAGE_NGINX_STREAM_GEO_MODULE),,--without-stream_geo_module) \
$(if $(BR2_PACKAGE_NGINX_STREAM_MAP_MODULE),,--without-stream_map_module) \
$(if $(BR2_PACKAGE_NGINX_STREAM_RETURN_MODULE),,--without-stream_return_module) \
$(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE),,--without-stream_upstream_hash_module) \
--
2.26.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 4/4] package/nginx: add stream geoip support
2020-06-22 19:31 [Buildroot] [PATCH 1/4] package/nginx: add stream map option Fabrice Fontaine
2020-06-22 19:31 ` [Buildroot] [PATCH 2/4] package/nginx: add stream return option Fabrice Fontaine
2020-06-22 19:31 ` [Buildroot] [PATCH 3/4] package/nginx: add stream geo option Fabrice Fontaine
@ 2020-06-22 19:31 ` Fabrice Fontaine
2020-06-22 20:45 ` [Buildroot] [PATCH 1/4] package/nginx: add stream map option Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2020-06-22 19:31 UTC (permalink / raw)
To: buildroot
stream geoip module has been added in version 1.11.3 with
https://github.com/nginx/nginx/commit/4cf0e2848372b7566f49a9cb4b8dcf9dbad43597
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/nginx/Config.in | 6 ++++++
package/nginx/nginx.mk | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/package/nginx/Config.in b/package/nginx/Config.in
index 09af4680ee..9f742e3e6b 100644
--- a/package/nginx/Config.in
+++ b/package/nginx/Config.in
@@ -334,6 +334,12 @@ config BR2_PACKAGE_NGINX_STREAM_SSL_MODULE
help
Enable ngx_stream_ssl_module
+config BR2_PACKAGE_NGINX_STREAM_GEOIP_MODULE
+ bool "ngx_stream_geoip_module"
+ select BR2_PACKAGE_GEOIP
+ help
+ Enable ngx_stream_geoip_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 7edc32613b..52b91bcde5 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -229,6 +229,11 @@ NGINX_DEPENDENCIES += openssl
NGINX_CONF_OPTS += --with-stream_ssl_module
endif
+ifeq ($(BR2_PACKAGE_NGINX_STREAM_GEOIP_MODULE),y)
+NGINX_DEPENDENCIES += geoip
+NGINX_CONF_OPTS += --with-stream_geoip_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.26.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/4] package/nginx: add stream map option
2020-06-22 19:31 [Buildroot] [PATCH 1/4] package/nginx: add stream map option Fabrice Fontaine
` (2 preceding siblings ...)
2020-06-22 19:31 ` [Buildroot] [PATCH 4/4] package/nginx: add stream geoip support Fabrice Fontaine
@ 2020-06-22 20:45 ` Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2020-06-22 20:45 UTC (permalink / raw)
To: buildroot
On Mon, 22 Jun 2020 21:31:11 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> stream map module has been added in version 1.11.3 with
> https://github.com/nginx/nginx/commit/05db6ddfa1ca120c1c348cc750acded2a01b090a
> and is enabled by default, add an option to be able to disable it
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/nginx/Config.in | 6 ++++++
> package/nginx/nginx.mk | 1 +
> 2 files changed, 7 insertions(+)
All applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread