[oe] [meta-webserver][PATCHv2 1/2] nginx: optimize systemd unit file

[Koen Kooi]

Op 18-08-16 om 18:09 schreef Martin Jansa:
> From: Szombathelyi György <gyurco at freemail.hu>
> 
> - 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 at freemail.hu>

Thanks, this was next on my TODO after collectd, excellent timing :)

And a thank you to Martin for fixing up the patch and redoing the intendation.


> ---
>  meta-webserver/recipes-httpd/nginx/files/nginx.service | 9 ++++-----
>  meta-webserver/recipes-httpd/nginx/nginx.inc           | 5 +++--
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.service b/meta-webserver/recipes-httpd/nginx/files/nginx.service
> index 9926a4b..ce99061 100644
> --- a/meta-webserver/recipes-httpd/nginx/files/nginx.service
> +++ b/meta-webserver/recipes-httpd/nginx/files/nginx.service
> @@ -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
> -
> diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc
> index fe51ca0..334a6d8 100644
> --- a/meta-webserver/recipes-httpd/nginx/nginx.inc
> +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
> @@ -73,8 +73,8 @@ do_install () {
>  	rm -fr ${D}${localstatedir}/run ${D}/run
>  	if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
>  		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 +90,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
>