diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx')
8 files changed, 28 insertions, 20 deletions
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 93f3c6634..472fde16a 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 fb7e4b65d..69d3a2adc 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 index 0f38b9cdb..1a2bd7dff 100755..100644 --- 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 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/nginx NAME=nginx DESC=nginx -PID=/var/run/nginx/nginx.pid +PID=/run/nginx/nginx.pid test -x $DAEMON || exit 0 diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index 36f2ac6d7..f98f29926 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -20,7 +20,9 @@ SRC_URI = " \ file://nginx.service \ " -inherit update-rc.d useradd +inherit update-rc.d useradd systemd + +SYSTEMD_SERVICE_${PN} = "nginx.service" CFLAGS_append = " -fPIE -pie" CXXFLAGS_append = " -fPIE -pie" @@ -61,6 +63,11 @@ do_configure () { --conf-path=${sysconfdir}/nginx/nginx.conf \ --http-log-path=${localstatedir}/log/nginx/access.log \ --error-log-path=${localstatedir}/log/nginx/error.log \ + --http-client-body-temp-path=/run/nginx/client_body_temp \ + --http-proxy-temp-path=/run/nginx/proxy_temp \ + --http-fastcgi-temp-path=/run/nginx/fastcgi_temp \ + --http-uwsgi-temp-path=/run/nginx/uwsgi_temp \ + --http-scgi-temp-path=/run/nginx/scgi_temp \ --pid-path=/run/nginx/nginx.pid \ --prefix=${prefix} \ --with-http_ssl_module \ @@ -98,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 diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.10.1.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.10.1.bb deleted file mode 100644 index c5392c766..000000000 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.10.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" - -SRC_URI[md5sum] = "088292d9caf6059ef328aa7dda332e44" -SRC_URI[sha256sum] = "1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801" diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.10.3.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.10.3.bb new file mode 100644 index 000000000..b62fd4c2c --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.10.3.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" + +SRC_URI[md5sum] = "204a20cb4f0b0c9db746c630d89ff4ea" +SRC_URI[sha256sum] = "75020f1364cac459cb733c4e1caed2d00376e40ea05588fb8793076a4c69dd90" diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.11.10.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.11.10.bb new file mode 100644 index 000000000..37565fc79 --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.11.10.bb @@ -0,0 +1,10 @@ +require nginx.inc + +# 1.10.x branch is the current stable branch, the recommended default +# 1.11.x is the current mainline branches containing all new features +DEFAULT_PREFERENCE = "-1" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=903753de5f86a1ee0341fd2f9491b282" + +SRC_URI[md5sum] = "6fb10f579055d27a2240d51c7d85c190" +SRC_URI[sha256sum] = "778b3cabb07633f754cd9dee32fc8e22582bce22bfa407be76a806abd935533d" diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.11.5.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.11.5.bb deleted file mode 100644 index ae05c963b..000000000 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.11.5.bb +++ /dev/null @@ -1,10 +0,0 @@ -require nginx.inc - -# 1.10.x branch is the current stable branch, the recommended default -# 1.11.x is the current mainline branches containing all new features -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" - -SRC_URI[md5sum] = "db43f2b19746f6f47401c3afc3924dc6" -SRC_URI[sha256sum] = "223f8a2345a75f891098cf26ccdf208b293350388f51ce69083674c9432db6f6" |