| commit | 6e60e8b2b2bab889379b380a28a167a0edd9d1d3 | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu Feb 01 10:27:11 2018 -0500 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Mon Mar 12 22:51:39 2018 -0400 |
| tree | f12f54d5ba8e74e67e5fad3651a1e125bb8f4191 | |
| parent | 509842add85b53e13164c1569a1fd43d5b8d91c5 [diff] |
Yocto 2.3 Move OpenBMC to Yocto 2.3(pyro). Tested: Built and verified Witherspoon and Palmetto images Change-Id: I50744030e771f4850afc2a93a10d3507e76d36bc Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Resolves: openbmc/openbmc#2461
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf index 93f3c66..472fde1 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf +++ b/import-layers/meta-openembedded/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/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf index fb7e4b6..69d3a2a 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf
@@ -1,5 +1,5 @@ -user www-data; +user www; worker_processes 1; error_log /var/log/nginx/error.log;
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.init b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.init old mode 100755 new mode 100644 index 0f38b9c..1a2bd7d --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.init +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.init
@@ -3,7 +3,7 @@ DAEMON=/usr/sbin/nginx NAME=nginx DESC=nginx -PID=/var/run/nginx/nginx.pid +PID=/run/nginx/nginx.pid test -x $DAEMON || exit 0