[oe-commits] [meta-openembedded] 04/04: nginx: fix kill path in nginx systemd unit file

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit dd5622ef2b4065dc80ee549c57a2ec5010d0b4d1
Author: nick83ola <nick83ola at gmail.com>
AuthorDate: Mon May 27 16:55:21 2019 +0100

    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 at gmail.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-webserver/recipes-httpd/nginx/files/nginx.service | 2 +-
 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 c6fc049..9a6ca96 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 d4c6e81..e202e85 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, at SYSCONFDIR@,${sysconfdir},g' \
             -e 's, at LOCALSTATEDIR@,${localstatedir},g' \
             -e 's, at SBINDIR@,${sbindir},g' \
-            -e 's, at BINDIR@,${bindir},g' \
+            -e 's, at BASE_BINDIR@,${base_bindir},g' \
             ${D}${systemd_unitdir}/system/nginx.service
     fi
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.