diff options
| author |   nick83ola <nick83ola@gmail.com> | 2019-05-27 16:55:21 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-05-27 09:48:07 -0700 |
| commit | dd5622ef2b4065dc80ee549c57a2ec5010d0b4d1 (patch) | |
| tree | 2050e88f5ff733deddcf09e7262f646a9d6531fd /meta-webserver | |
| parent | acb604775efa93c245b5f696e4f2d27b006c4351 (diff) | |
| download | meta-openembedded-contrib-dd5622ef2b4065dc80ee549c57a2ec5010d0b4d1.tar.gz | |
nginx: fix kill path in nginx systemd unit file
the kill utility is located in /bin/kill -> use base_bindir instead of bindir
Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
| -rw-r--r-- | meta-webserver/recipes-httpd/nginx/files/nginx.service | 2 | ||||
| -rw-r--r-- | meta-webserver/recipes-httpd/nginx/nginx.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.service b/meta-webserver/recipes-httpd/nginx/files/nginx.service index c6fc0495f1a..9a6ca96517f 100644 --- a/meta-webserver/recipes-httpd/nginx/files/nginx.service +++ b/meta-webserver/recipes-httpd/nginx/files/nginx.service @@ -8,7 +8,7 @@ PIDFile=/run/nginx/nginx.pid ExecStartPre=@SBINDIR@/nginx -t ExecStart=@SBINDIR@/nginx ExecReload=@SBINDIR@/nginx -s reload -ExecStop=@BINDIR@/kill -s QUIT $MAINPID +ExecStop=@BASE_BINDIR@/kill -s QUIT $MAINPID PrivateTmp=true [Install] diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index d4c6e81fa30..e202e856370 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -135,7 +135,7 @@ do_install () { sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@BINDIR@,${bindir},g' \ + -e 's,@BASE_BINDIR@,${base_bindir},g' \ ${D}${systemd_unitdir}/system/nginx.service fi } |