aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2017-03-21 10:42:51 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-03-31 13:26:00 +0200
commitd050a35031b5ee2afcdaf13b871cb6be6407e6f6 (patch)
tree4d1578ae0296a9bc4b52f1e99d2bf60439b0b0fa /meta-webserver
parenta4e4cfd932796953efa6d93cce76cd93c558b9a2 (diff)
downloadmeta-openembedded-d050a35031b5ee2afcdaf13b871cb6be6407e6f6.tar.gz
meta-openembedded-d050a35031b5ee2afcdaf13b871cb6be6407e6f6.tar.bz2
meta-openembedded-d050a35031b5ee2afcdaf13b871cb6be6407e6f6.zip
nginx: make sure the user is correctly set for the volatile directories
Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf2
-rw-r--r--meta-webserver/recipes-httpd/nginx/nginx.inc1
2 files changed, 2 insertions, 1 deletions
diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf b/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf
index 93f3c6634..472fde16a 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 7f8393789..f98f29926 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