diff options
| -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 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 @@ | |||
| 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 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 () { | |||
| 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 |
