[oe-commits] [meta-openembedded] 27/29: nginx: make sure the user is correctly set for the volatile directories
git at git.openembedded.org
git at git.openembedded.org
Sat Mar 25 08:09:47 UTC 2017
This is an automated email from the git hooks/post-receive script.
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit 499ade1dfbe57edfbf3685b55f0140693ebe7ae0
Author: Pascal Bach <pascal.bach at siemens.com>
AuthorDate: Tue Mar 21 10:42:51 2017 +0100
nginx: make sure the user is correctly set for the volatile directories
Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
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(-)
diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf b/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf
index 93f3c66..472fde1 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 7f83937..f98f299 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, at 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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list