diff options
author | Pascal Bach <pascal.bach@siemens.com> | 2017-03-21 10:42:51 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-03-31 13:26:00 +0200 |
commit | d050a35031b5ee2afcdaf13b871cb6be6407e6f6 (patch) | |
tree | 4d1578ae0296a9bc4b52f1e99d2bf60439b0b0fa /meta-webserver/recipes-httpd/nginx | |
parent | a4e4cfd932796953efa6d93cce76cd93c558b9a2 (diff) | |
download | meta-openembedded-d050a35031b5ee2afcdaf13b871cb6be6407e6f6.tar.gz |
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/recipes-httpd/nginx')
-rw-r--r-- | meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf | 2 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/nginx/nginx.inc | 1 |
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 @@ | |||
1 | d www www-data 0755 /run/nginx none | 1 | d @NGINX_USER@ www-data 0755 /run/nginx none |
2 | d root root 0755 /var/log/nginx none | 2 | 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 () { | |||
105 | install -d ${D}${sysconfdir}/default/volatiles | 105 | install -d ${D}${sysconfdir}/default/volatiles |
106 | install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx | 106 | install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx |
107 | sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx | 107 | sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx |
108 | sed -i 's,@NGINX_USER@,${NGINX_USER},g' ${D}${sysconfdir}/default/volatiles/99_nginx | ||
108 | 109 | ||
109 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then | 110 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then |
110 | install -d ${D}${systemd_unitdir}/system | 111 | install -d ${D}${systemd_unitdir}/system |