From d050a35031b5ee2afcdaf13b871cb6be6407e6f6 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 21 Mar 2017 10:42:51 +0100 Subject: nginx: make sure the user is correctly set for the volatile directories Signed-off-by: Pascal Bach Signed-off-by: Martin Jansa --- meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf | 2 +- meta-webserver/recipes-httpd/nginx/nginx.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf b/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf index 93f3c66345..472fde16a8 100644 --- a/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf +++ b/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf @@ -1,2 +1,2 @@ -d www www-data 0755 /run/nginx none +d @NGINX_USER@ www-data 0755 /run/nginx none d root root 0755 /var/log/nginx none diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 7f8393789a..f98f299262 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -105,6 +105,7 @@ 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 + sed -i 's,@NGINX_USER@,${NGINX_USER},g' ${D}${sysconfdir}/default/volatiles/99_nginx if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then install -d ${D}${systemd_unitdir}/system -- cgit 1.2.3-korg