From 6fc2fcdd935604bfada0866b476c92228d8451c0 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Tue, 2 Oct 2018 21:09:49 -0700 Subject: openpower: phosphor-webui: set append wildcard For a recipe without a suffix piece, add wildcard to the append. Next will update the recipe. Then update the append again. (From meta-openpower rev: 07ce33c80e1261090f5120fb19c2088d8bd1a61c) Change-Id: I83dc58ad2b13eb331961bf2515fe0db8d81e37b5 Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- .../recipes-phosphor/webui/phosphor-webui%.bbappend | 16 ++++++++++++++++ .../recipes-phosphor/webui/phosphor-webui.bbappend | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 meta-openpower/recipes-phosphor/webui/phosphor-webui%.bbappend delete mode 100644 meta-openpower/recipes-phosphor/webui/phosphor-webui.bbappend (limited to 'meta-openpower') diff --git a/meta-openpower/recipes-phosphor/webui/phosphor-webui%.bbappend b/meta-openpower/recipes-phosphor/webui/phosphor-webui%.bbappend new file mode 100644 index 0000000000..17dd7397bc --- /dev/null +++ b/meta-openpower/recipes-phosphor/webui/phosphor-webui%.bbappend @@ -0,0 +1,16 @@ +do_install_append_df-openpower () { + +# The webui content is served as pre-compressed gzip content. While nginx can +# handle this via the gzip_static directive (and we use that), the nginx +# try_files directive (which we also use) searches the URI as-is. The suggested +# workaround is to have an empty uncompressed file with the same name as the +# compressed file. This does not impact the functionality of gzip_static. +# So for eg if there's an index.html.gz, create an empty index.html. Same goes +# for all the webui content. +# https://serverfault.com/questions/571733/nginx-gzip-static-why-are-the-non-compressed-files-required +# https://www.ruby-forum.com/topic/4402481 +# https://trac.nginx.org/nginx/ticket/1367 + +find ${D}${datadir}/www -type f -name '*.gz' -exec sh -c 'touch `dirname "$0"`/`basename "$0" .gz`' '{}' \; + +} diff --git a/meta-openpower/recipes-phosphor/webui/phosphor-webui.bbappend b/meta-openpower/recipes-phosphor/webui/phosphor-webui.bbappend deleted file mode 100644 index 17dd7397bc..0000000000 --- a/meta-openpower/recipes-phosphor/webui/phosphor-webui.bbappend +++ /dev/null @@ -1,16 +0,0 @@ -do_install_append_df-openpower () { - -# The webui content is served as pre-compressed gzip content. While nginx can -# handle this via the gzip_static directive (and we use that), the nginx -# try_files directive (which we also use) searches the URI as-is. The suggested -# workaround is to have an empty uncompressed file with the same name as the -# compressed file. This does not impact the functionality of gzip_static. -# So for eg if there's an index.html.gz, create an empty index.html. Same goes -# for all the webui content. -# https://serverfault.com/questions/571733/nginx-gzip-static-why-are-the-non-compressed-files-required -# https://www.ruby-forum.com/topic/4402481 -# https://trac.nginx.org/nginx/ticket/1367 - -find ${D}${datadir}/www -type f -name '*.gz' -exec sh -c 'touch `dirname "$0"`/`basename "$0" .gz`' '{}' \; - -} -- cgit v1.2.3