CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

nginx: optimize systemd unit file

Browse Source 
- Call the nginx binary directly, no need to wrap the SysV init file.
- Create /var/log/nginx with tmpfiles, like volatiles without systemd.
- Run nginx with ${NGINX_USER} (user ${NGINX_USER} in nginx.conf)

Signed-off-by: Gyorgy Szombathelyi <gyurco@freemail.hu>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Szombathelyi György 2016-08-18 15:58:34 +02:00 committed by Martin Jansa
parent 6c7c69c700
commit 8e6425cfa1
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta-webserver/recipes-httpd/nginx/files/nginx.service
View File

@ -3,10 +3,9 @@ Description=Nginx Server
After=network.target
[Service]
Type=forking
PIDFile=@SYSCONFDIR@/nginx/run/nginx.pid
ExecStartPre=@BASEBINDIR@/mkdir -p @LOCALSTATEDIR@/log/nginx
ExecStart=@SYSCONFDIR@/init.d/nginx start
ExecStop=@SYSCONFDIR@/init.d/nginx stop
PIDFile=/run/nginx/nginx.pid
ExecStart=@SBINDIR@/nginx
ExecStop=@SBINDIR@/nginx -s stop
ExecReload=@SBINDIR@/nginx -s reload
[Install]
WantedBy=multi-user.target

5
meta-webserver/recipes-httpd/nginx/nginx.inc
View File

@ -75,6 +75,8 @@ do_install () {
install -d ${D}${sysconfdir}/tmpfiles.d
echo "d /run/${BPN} - - - -" \
> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
echo "d /${localstatedir}/log/${BPN} 0755 root root -" \
>> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
fi
install -d ${D}${sysconfdir}/${BPN}
ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
@ -90,6 +92,7 @@ do_install () {
install -d ${D}${sysconfdir}/nginx
install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf
sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf
sed -i 's/^user.*/user ${NGINX_USER};/g' ${D}${sysconfdir}/nginx/nginx.conf
install -d ${D}${sysconfdir}/nginx/sites-enabled
install -d ${D}${sysconfdir}/default/volatiles
@ -101,7 +104,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' \
-e 's,@SBINDIR@,${sbindir},g' \
${D}${systemd_unitdir}/system/nginx.service
fi
}