[oe-commits] Alejandro Hernandez : nginx: Add suport for systemd
git at git.openembedded.org
git at git.openembedded.org
Fri May 22 18:13:52 UTC 2015
Module: meta-openembedded.git
Branch: master
Commit: c8ae4dc8ce180bfdf706d98c1501105c97899f5b
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c8ae4dc8ce180bfdf706d98c1501105c97899f5b
Author: Alejandro Hernandez <alejandro.hernandez at linux.intel.com>
Date: Fri May 15 01:46:08 2015 -0500
nginx: Add suport for systemd
Adds support for systemd, creates a service for nginx and installs it if required
Signed-off-by: Alejandro Hernandez <alejandro.hernandez at linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-webserver/recipes-httpd/nginx/files/nginx.service | 12 ++++++++++++
meta-webserver/recipes-httpd/nginx/nginx_1.4.4.bb | 13 ++++++++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.service b/meta-webserver/recipes-httpd/nginx/files/nginx.service
new file mode 100644
index 0000000..705450e
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/files/nginx.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Nginx Server
+After=network.target
+[Service]
+Type=forking
+PIDFile=@SYSCONFDIR@/nginx/run/nginx.pid
+ExecStartPre=mkdir -p @LOCALSTATEDIR@/log/nginx
+ExecStart=@SYSCONFDIR@/init.d/nginx start
+ExecStop=@SYSCONFDIR@/init.d/nginx stop
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.4.4.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.4.4.bb
index e78ed34..0dfdb5b 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.4.4.bb
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.4.4.bb
@@ -17,6 +17,7 @@ SRC_URI = " \
file://nginx.conf \
file://nginx.init \
file://nginx-volatile.conf \
+ file://nginx.service \
"
SRC_URI[md5sum] = "5dfaba1cbeae9087f3949860a02caa9f"
SRC_URI[sha256sum] = "7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9"
@@ -81,6 +82,14 @@ do_install () {
install -d ${D}${sysconfdir}/default/volatiles
install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx
sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/
+ sed -i -e 's, at SYSCONFDIR@,${sysconfdir},g' \
+ -e 's, at LOCALSTATEDIR@,${localstatedir},g' \
+ ${D}${systemd_unitdir}/system/nginx.service
+ fi
}
pkg_postinst_${PN} () {
@@ -93,7 +102,9 @@ pkg_postinst_${PN} () {
fi
}
-FILES_${PN} += "${localstatedir}/"
+FILES_${PN} += "${localstatedir}/ \
+ ${systemd_unitdir}/system/nginx.service \
+ "
CONFFILES_${PN} = "${sysconfdir}/nginx/nginx.conf \
${sysconfdir}/nginx/fastcgi.conf\
More information about the Openembedded-commits
mailing list