* [PATCH] nginx: fix kill path in nginx systemd unit file
@ 2019-05-24 14:36 Nicola Lunghi
2019-05-24 16:27 ` akuster808
0 siblings, 1 reply; 3+ messages in thread
From: Nicola Lunghi @ 2019-05-24 14:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Nicola Lunghi <nick83ola@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 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
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 29e7efc14..c4c776e37 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -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
}
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] nginx: fix kill path in nginx systemd unit file
2019-05-24 14:36 [PATCH] nginx: fix kill path in nginx systemd unit file Nicola Lunghi
@ 2019-05-24 16:27 ` akuster808
2019-05-27 15:57 ` nick83ola
0 siblings, 1 reply; 3+ messages in thread
From: akuster808 @ 2019-05-24 16:27 UTC (permalink / raw)
To: Nicola Lunghi, openembedded-core
On 5/24/19 7:36 AM, Nicola Lunghi wrote:
> Signed-off-by: Nicola Lunghi <nick83ola@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(-)
Wrong mailing list.
please send to openembedded-devel@lists.openembedded.org
>
> 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
> 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 29e7efc14..c4c776e37 100644
> --- a/meta-webserver/recipes-httpd/nginx/nginx.inc
> +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
> @@ -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
> }
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] nginx: fix kill path in nginx systemd unit file
2019-05-24 16:27 ` akuster808
@ 2019-05-27 15:57 ` nick83ola
0 siblings, 0 replies; 3+ messages in thread
From: nick83ola @ 2019-05-27 15:57 UTC (permalink / raw)
To: akuster808; +Cc: openembedded-core
Thanks (and sorry again)
On Fri, 24 May 2019 at 17:27, akuster808 <akuster808@gmail.com> wrote:
>
>
>
> On 5/24/19 7:36 AM, Nicola Lunghi wrote:
> > Signed-off-by: Nicola Lunghi <nick83ola@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(-)
>
> Wrong mailing list.
>
> please send to openembedded-devel@lists.openembedded.org
>
> >
> > 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
> > 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 29e7efc14..c4c776e37 100644
> > --- a/meta-webserver/recipes-httpd/nginx/nginx.inc
> > +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
> > @@ -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
> > }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-27 15:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-24 14:36 [PATCH] nginx: fix kill path in nginx systemd unit file Nicola Lunghi
2019-05-24 16:27 ` akuster808
2019-05-27 15:57 ` nick83ola
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.