From 62609f1587b2e272dc8a2245e36ca6dc7d0c8820 Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Tue, 12 May 2020 11:00:00 +0200 Subject: nginx: do not reduce max processes Use the upstream value for NGX_MAX_PROCESSES (=1024) again. So it is safe to use `worker_processes auto;` (which sets it to the number of CPUs). Also use this directive in the conf instead of calculating the number in the init and passing it as argument. Signed-off-by: Peter Stadler --- net/nginx/files/nginx.conf | 2 ++ net/nginx/files/nginx.init | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'net/nginx/files') diff --git a/net/nginx/files/nginx.conf b/net/nginx/files/nginx.conf index 65d37b504..da1cbdf42 100644 --- a/net/nginx/files/nginx.conf +++ b/net/nginx/files/nginx.conf @@ -1,6 +1,8 @@ # Please consider creating files in /etc/nginx/conf.d/ instead of editing this. # For details see https://openwrt.org/docs/guide-user/services/webserver/nginx +worker_processes auto; + user root; events {} diff --git a/net/nginx/files/nginx.init b/net/nginx/files/nginx.init index 57142950b..fa189931c 100644 --- a/net/nginx/files/nginx.init +++ b/net/nginx/files/nginx.init @@ -16,9 +16,8 @@ start_service() { ${NGINX_UTIL} init_lan procd_open_instance - NCPUS="$(grep -c '^processor\s*:' /proc/cpuinfo)" procd_set_param command /usr/sbin/nginx -c "${NGINX_CONF}" \ - -g "daemon off; worker_processes $NCPUS;" + -g "daemon off;" procd_set_param stdout 1 procd_set_param stderr 1 procd_set_param file "${LAN_LISTEN}" "${LAN_LISTEN}.default" \ -- cgit v1.2.3