From fc5b483f76571528462806fe030052a8319f8fe6 Mon Sep 17 00:00:00 2001 From: Amarnath Valluri Date: Fri, 6 Nov 2015 15:27:38 +0200 Subject: nginx: Fix systemd service file systemd service file expects full path of the executatbles. Signed-off-by: Amarnath Valluri Signed-off-by: Martin Jansa --- meta-webserver/recipes-httpd/nginx/files/nginx.service | 2 +- meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.service b/meta-webserver/recipes-httpd/nginx/files/nginx.service index 705450e471..9926a4b9d9 100644 --- a/meta-webserver/recipes-httpd/nginx/files/nginx.service +++ b/meta-webserver/recipes-httpd/nginx/files/nginx.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking PIDFile=@SYSCONFDIR@/nginx/run/nginx.pid -ExecStartPre=mkdir -p @LOCALSTATEDIR@/log/nginx +ExecStartPre=@BASEBINDIR@/mkdir -p @LOCALSTATEDIR@/log/nginx ExecStart=@SYSCONFDIR@/init.d/nginx start ExecStop=@SYSCONFDIR@/init.d/nginx stop [Install] diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb index 1c9bff7fbc..87c953b566 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb +++ b/meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb @@ -94,6 +94,7 @@ do_install () { install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/ sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ + -e 's,@BASEBINDIR@,${base_bindir},g' \ ${D}${systemd_unitdir}/system/nginx.service fi } -- cgit 1.2.3-korg