aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-05-06 15:02:09 +0800
committerArmin Kuster <akuster808@gmail.com>2020-05-17 14:30:29 -0700
commit775ad5a08ec9fa80c6e731d69ca45c22c6664d9e (patch)
tree2aa2f48b639a57b59676d2bbebfb85f738382ec9 /meta-webserver
parent26eeb83572ebd70de831ab724d254811e6b8912a (diff)
downloadmeta-openembedded-contrib-775ad5a08ec9fa80c6e731d69ca45c22c6664d9e.tar.gz
nginx: remove /var/log/nginx when do_install
Remove directory /var/log/nginx when do_install because it is created by volatiles file. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 6e9f393605eed1e5f4e317536b1463b83b978bad) Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-httpd/nginx/nginx.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc
index 2824c66529..de080a2b01 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -90,7 +90,7 @@ do_install () {
install -d ${D}${sysconfdir}/tmpfiles.d
echo "d /run/${BPN} - - - -" \
> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
- echo "d /${localstatedir}/log/${BPN} 0755 root root -" \
+ echo "d ${localstatedir}/log/${BPN} 0755 root root -" \
>> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
fi
install -d ${D}${sysconfdir}/${BPN}
@@ -139,6 +139,8 @@ do_install () {
-e 's,@BASE_BINDIR@,${base_bindir},g' \
${D}${systemd_unitdir}/system/nginx.service
fi
+
+ rm -rf ${D}${localstatedir}/log/
}
pkg_postinst_${PN} () {