From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 29 Aug 2025 11:47:14 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1urvhT-005m1j-03 for lore@lore.pengutronix.de; Fri, 29 Aug 2025 11:47:14 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1urvhS-0006Le-4K; Fri, 29 Aug 2025 11:47:14 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1urvgb-0003um-ED; Fri, 29 Aug 2025 11:46:21 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1urvgb-002hs0-0p; Fri, 29 Aug 2025 11:46:21 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1urvgb-0000000AzTi-0s35; Fri, 29 Aug 2025 11:46:21 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 29 Aug 2025 11:46:21 +0200 Message-ID: <20250829094621.2619595-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250814095146.1942317-2-f.pflug@pengutronix.de> References: <20250814095146.1942317-2-f.pflug@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] nginx: make http_limit modules selectable X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Fabian Pflug Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as a03f96999b74658894c36c1a2640a22f2e7ce788. Michael [sent from post-receive hook] On Fri, 29 Aug 2025 11:46:21 +0200, Fabian Pflug wrote: > Signed-off-by: Fabian Pflug > Message-Id: <20250814095146.1942317-2-f.pflug@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/nginx.in b/rules/nginx.in > index 6b2fed14b757..f83031e97f71 100644 > --- a/rules/nginx.in > +++ b/rules/nginx.in > @@ -84,6 +84,22 @@ config NGINX_HTTP_GRPC_MODULE > help > ngx_http_grpc_module allows passing requests to a gRPC server. > > +config NGINX_HTTP_LIMIT_CON_MODULE > + bool > + prompt "ngx_http_limit_conn_module" > + help > + The ngx_http_limit_conn_module module is used to limit the number > + of connections per the defined key, in particular, the number of > + connections from a single IP address. > + > +config NGINX_HTTP_LIMIT_REQ_MODULE > + bool > + prompt "ngx_http_limit_req_module" > + help > + The ngx_http_limit_req_module module is used to limit the > + request processing rate per a defined key, in particular, > + the processing rate of requests coming from a single IP address. > + > config NGINX_HTTP_PROXY_MODULE > bool > prompt "ngx_http_proxy_module" > diff --git a/rules/nginx.make b/rules/nginx.make > index 7cb2fb58e2a9..5694eeb04550 100644 > --- a/rules/nginx.make > +++ b/rules/nginx.make > @@ -87,8 +87,8 @@ NGINX_CONF_OPT := \ > $(call ptx/ifdef, PTXCONF_NGINX_HTTP_SCGI_MODULE,,--without-http_scgi_module) \ > $(call ptx/ifdef, PTXCONF_NGINX_HTTP_GRPC_MODULE,,--without-http_grpc_module) \ > --without-http_memcached_module \ > - --without-http_limit_conn_module \ > - --without-http_limit_req_module \ > + $(call ptx/ifdef, PTXCONF_NGINX_HTTP_LIMIT_CON_MODULE,,--without-http_limit_conn_module) \ > + $(call ptx/ifdef, PTXCONF_NGINX_HTTP_LIMIT_REQ_MODULE,,--without-http_limit_req_module) \ > --without-http_empty_gif_module \ > --without-http_browser_module \ > --without-http_upstream_hash_module \