mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
eclass/nginx.eclass: Install *_params files to /etc/nginx
Previously, the {fastcgi,scgi,uwcgi}_params files would be installed in
/usr/share/nginx. This broke workflows for the users that included the
files from the main config, i.e. the included files would not be found.
This commit brings the files back to /etc/nginx to reflect the
pre-nginx.eclass behaviour.
Closes: https://bugs.gentoo.org/960357
Signed-off-by: Zurab Kvachadze <zurabid2016@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43166
Closes: https://github.com/gentoo/gentoo/pull/43166
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
committed by
Sam James
parent
420e988dff
commit
d996cff509
@@ -23,7 +23,7 @@
|
||||
# - NGINX_MISC_FILES
|
||||
|
||||
case ${EAPI} in
|
||||
8) ;;
|
||||
8) inherit eapi9-pipestatus ;;
|
||||
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
|
||||
esac
|
||||
|
||||
@@ -800,8 +800,12 @@ nginx_src_install() {
|
||||
rm -- *.default mime.types fastcgi.conf nginx.conf || die "rm failed"
|
||||
popd >/dev/null || die "Returning to the previous directory failed"
|
||||
|
||||
dodir /usr/share
|
||||
mv "${ED}/etc/nginx" "${ED}/usr/share/nginx" || die "mv failed"
|
||||
dodir /usr/share/nginx
|
||||
# Move all miscellaneous bundled files apart from *_params from /etc/nginx
|
||||
# to /usr/share/nginx.
|
||||
find "${ED}/etc/nginx" -type f -not -iname '*_params' -print0 |
|
||||
xargs -0 -I{} mv {} "${ED}/usr/share/nginx"
|
||||
pipestatus || die "find failed"
|
||||
|
||||
insinto /usr/share/nginx
|
||||
if [[ ${NGINX_UPDATE_STREAM} != live ]]; then
|
||||
|
||||
Reference in New Issue
Block a user