diff options
| -rw-r--r-- | eclass/nginx.eclass | 10 | ||||
| -rw-r--r-- | www-servers/nginx/files/nginx-r6.initd | 1 | ||||
| -rw-r--r-- | www-servers/nginx/nginx-1.28.0-r5.ebuild (renamed from www-servers/nginx/nginx-1.28.0-r4.ebuild) | 0 | ||||
| -rw-r--r-- | www-servers/nginx/nginx-1.29.3-r3.ebuild (renamed from www-servers/nginx/nginx-1.29.3-r2.ebuild) | 0 |
4 files changed, 8 insertions, 3 deletions
diff --git a/eclass/nginx.eclass b/eclass/nginx.eclass index 7185c8509595..1394a5f3da94 100644 --- a/eclass/nginx.eclass +++ b/eclass/nginx.eclass @@ -795,9 +795,13 @@ nginx_src_install() { # /usr/share/nginx. pushd "${ED}/etc/nginx" >/dev/null || die "pushd failed" # mime-types* are provided by app-misc/mime-types[nginx], .default config - # files are redundant due to CONFIG_PROTECT and fastcgi.conf is a copy of - # fastcgi_params. As for nginx.conf, we ship our own config file. - rm -- *.default mime.types fastcgi.conf nginx.conf || die "rm failed" + # files are redundant due to CONFIG_PROTECT. As for nginx.conf, we ship our + # own config file. + rm -- *.default mime.types nginx.conf || die "rm failed" + # fastcgi.conf is almost identical to fastcgi_params barring the + # SCRIPT_FILENAME param. Rename fastcgi.conf to fastcgi_params to have + # consistent *_params files. See bug 966799. + mv fastcgi.conf fastcgi_params || die "mv failed" popd >/dev/null || die "Returning to the previous directory failed" dodir /usr/share/nginx diff --git a/www-servers/nginx/files/nginx-r6.initd b/www-servers/nginx/files/nginx-r6.initd index 04f92e3b244b..35c05a9b3bb7 100644 --- a/www-servers/nginx/files/nginx-r6.initd +++ b/www-servers/nginx/files/nginx-r6.initd @@ -17,6 +17,7 @@ pidfile="/run/${RC_SVCNAME}/${RC_SVCNAME}.pid" user=${NGINX_USER:-nginx} group=${NGINX_GROUP:-nginx} retry=${NGINX_TERMTIMEOUT:-"TERM/60/KILL/5"} +command_args="-c \"${NGINX_CONFIGFILE}\" -g 'pid ${pidfile};'" extra_commands="configtest" extra_started_commands="upgrade reload" diff --git a/www-servers/nginx/nginx-1.28.0-r4.ebuild b/www-servers/nginx/nginx-1.28.0-r5.ebuild index 1f99b81df43c..1f99b81df43c 100644 --- a/www-servers/nginx/nginx-1.28.0-r4.ebuild +++ b/www-servers/nginx/nginx-1.28.0-r5.ebuild diff --git a/www-servers/nginx/nginx-1.29.3-r2.ebuild b/www-servers/nginx/nginx-1.29.3-r3.ebuild index a7c27a668537..a7c27a668537 100644 --- a/www-servers/nginx/nginx-1.29.3-r2.ebuild +++ b/www-servers/nginx/nginx-1.29.3-r3.ebuild |