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-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 c6fc0495f..9a6ca9651 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 | |||
8 | ExecStartPre=@SBINDIR@/nginx -t | 8 | ExecStartPre=@SBINDIR@/nginx -t |
9 | ExecStart=@SBINDIR@/nginx | 9 | ExecStart=@SBINDIR@/nginx |
10 | ExecReload=@SBINDIR@/nginx -s reload | 10 | ExecReload=@SBINDIR@/nginx -s reload |
11 | ExecStop=@BINDIR@/kill -s QUIT $MAINPID | 11 | ExecStop=@BASE_BINDIR@/kill -s QUIT $MAINPID |
12 | PrivateTmp=true | 12 | PrivateTmp=true |
13 | 13 | ||
14 | [Install] | 14 | [Install] |
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index d4c6e81fa..e202e8563 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc | |||
@@ -135,7 +135,7 @@ do_install () { | |||
135 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 135 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
136 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ | 136 | -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ |
137 | -e 's,@SBINDIR@,${sbindir},g' \ | 137 | -e 's,@SBINDIR@,${sbindir},g' \ |
138 | -e 's,@BINDIR@,${bindir},g' \ | 138 | -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
139 | ${D}${systemd_unitdir}/system/nginx.service | 139 | ${D}${systemd_unitdir}/system/nginx.service |
140 | fi | 140 | fi |
141 | } | 141 | } |