mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-10 00:10:19 +03:00
75c2cb66ee
nginx.eclass prefers fastcgi_params over fastcgi.conf for consistency.
For some reason, when I was writing nginx.eclass I missed the fact that
fastcgi.conf has one extra `fastcgi_param` vs fastcgi_params. This
commit uses fastcgi.conf as new fastcgi_params by renaming the former to
the latter.
In 8481acdc2c34e960f08cd90ce09068d791e42901[1] ("www-servers/nginx: use
default start/stop initd functions"), the custom start() was removed,
where the `-c` and `-g` cmdline parameters were hardcoded, which regressed
services that were symlinked to /etc/init.d/nginx.
This commit fixes both issues at the same time to avoid revbumping
ebuilds twice. KEYWORDS were not dropped because this fixes regressions.
[1]: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8481acdc2c34e960f08cd90ce09068d791e42901
Closes: https://bugs.gentoo.org/966799
Closes: https://bugs.gentoo.org/966798
Signed-off-by: Zurab Kvachadze <zurabid2016@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44853
Closes: https://github.com/gentoo/gentoo/pull/44853
Signed-off-by: Sam James <sam@gentoo.org>
35 lines
1.2 KiB
Bash
35 lines
1.2 KiB
Bash
# Copyright 1999-2025 Gentoo Authors
|
|
# Distributed under the terms of the GNU General Public License v2
|
|
|
|
EAPI=8
|
|
|
|
NGINX_SUBSYSTEMS=(+http stream mail)
|
|
NGINX_MODULES=(
|
|
+http_{charset,gzip,ssi,userid,access,auth_basic,mirror,autoindex,geo,map}
|
|
+http_{split_clients,referer,rewrite,proxy,fastcgi,uwsgi,scgi,grpc}
|
|
+http_{memcached,limit_conn,limit_req,empty_gif,browser,upstream_hash}
|
|
+http_{upstream_ip_hash,upstream_least_conn,upstream_random}
|
|
+http_{upstream_keepalive,upstream_zone}
|
|
http_{ssl,v2,v3,realip,addition,xslt,image_filter,geoip,sub,dav,flv,mp4}
|
|
http_{gunzip,gzip_static,auth_request,random_index,secure_link,degradation}
|
|
http_{slice,stub_status,perl}
|
|
+mail_{pop3,imap,smtp}
|
|
mail_ssl
|
|
+stream_{limit_conn,access,geo,map,split_clients,return,pass,set}
|
|
+stream_{upstream_hash,upstream_least_conn,upstream_random,upstream_zone}
|
|
stream_{ssl,realip,geoip,ssl_preread}
|
|
)
|
|
NGINX_UPDATE_STREAM=stable
|
|
NGINX_TESTS_COMMIT=06a36245e134eac985cdfc5fac982cb149f61412
|
|
NGINX_MISC_FILES=(
|
|
nginx-{r2.logrotate,r2.service,r4.conf,r6.initd,r1.confd,r1.tmpfiles}
|
|
)
|
|
|
|
inherit nginx
|
|
|
|
KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
|
|
|
|
PATCHES=(
|
|
"${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
|
|
)
|