Skip to contentSkip to conversation

nginx: fix kill path in nginx systemd unit file

PATCH In review Nicola Lunghi 2 participants 3 messages May 24, 2019 – May 27, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nginx: fix kill path in nginx systemd unit file

---
 meta-webserver/recipes-httpd/nginx/files/nginx.service | 2 +-
 meta-webserver/recipes-httpd/nginx/nginx.inc           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta-webserver/recipes-httpd/nginx/files/nginx.service +1 -1
index c6fc0495f..9a6ca9651 100644
@@ -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]
meta-webserver/recipes-httpd/nginx/nginx.inc +1 -1
index 29e7efc14..c4c776e37 100644
@@ -134,7 +134,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
 }
Signature · 1 line
2.20.1
#1 lore raw
Quoted 5 lines · Nicola Lunghi
---
 meta-webserver/recipes-httpd/nginx/files/nginx.service | 2 +-
 meta-webserver/recipes-httpd/nginx/nginx.inc           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Wrong mailing list.

please send to [email protected]

Quoted 27 lines
meta-webserver/recipes-httpd/nginx/files/nginx.service +1 -1
index c6fc0495f..9a6ca9651 100644
@@ -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]
meta-webserver/recipes-httpd/nginx/nginx.inc +1 -1
index 29e7efc14..c4c776e37 100644
@@ -134,7 +134,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
 }
author
#2 lore raw

Thanks (and sorry again)

Quoted 42 lines · On Fri, 24 May 2019 at 17:27, akuster808 <[email protected]> wrote:
Quoted 5 lines · Nicola Lunghi
---
 meta-webserver/recipes-httpd/nginx/files/nginx.service | 2 +-
 meta-webserver/recipes-httpd/nginx/nginx.inc           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Wrong mailing list.

please send to [email protected]

Quoted 27 lines
meta-webserver/recipes-httpd/nginx/files/nginx.service +1 -1
index c6fc0495f..9a6ca9651 100644
@@ -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]
meta-webserver/recipes-httpd/nginx/nginx.inc +1 -1
index 29e7efc14..c4c776e37 100644
@@ -134,7 +134,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
 }