nginx: adds new socket to luci uwsgi config

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 244b7abe096434012cdef1a1f0988641724bbc4e..c14fb15795bfd51912f4a02bb5ce8b01a3fbb020 100644 (file)
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
 PKG_VERSION:=1.16.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://nginx.org/download/
@@ -196,6 +196,8 @@ ifneq ($(BUILD_VARIANT),all-module)
   endif
   ifneq ($(CONFIG_NGINX_HTTP_UWSGI),y)
     ADDITIONAL_MODULES += --without-http_uwsgi_module
+  else
+    config_files += uwsgi_params
   endif
   ifneq ($(CONFIG_NGINX_HTTP_SCGI),y)
     ADDITIONAL_MODULES += --without-http_scgi_module

diff --git a/net/nginx/files-luci-support/luci_uwsgi.conf b/net/nginx/files-luci-support/luci_uwsgi.conf
index 6211db74a9e49a8163a9943d46c636cd97d8708f..404eff2a68fa7065f3cc69efa43c66ed4ca58090 100644 (file)
--- a/net/nginx/files-luci-support/luci_uwsgi.conf
+++ b/net/nginx/files-luci-support/luci_uwsgi.conf
@@ -1,19 +1,15 @@
 location /cgi-bin/luci {
-    index  index.html;
-    uwsgi_param QUERY_STRING $query_string;
-    uwsgi_param REQUEST_METHOD $request_method;
-    uwsgi_param CONTENT_TYPE $content_type;
-    uwsgi_param CONTENT_LENGTH $content_length if_not_empty;
-    uwsgi_param REQUEST_URI $request_uri;
-    uwsgi_param PATH_INFO $document_uri;
-    uwsgi_param SERVER_PROTOCOL $server_protocol;
-    uwsgi_param REMOTE_ADDR $remote_addr;
-    uwsgi_param REMOTE_PORT $remote_port;
-    uwsgi_param SERVER_ADDR $server_addr;
-    uwsgi_param SERVER_PORT $server_port;
-    uwsgi_param SERVER_NAME $server_name;
-    uwsgi_modifier1 9;
-    uwsgi_pass unix:////var/run/uwsgi.sock;
+               index  index.html;
+               include uwsgi_params;
+               uwsgi_param SERVER_ADDR $server_addr;
+               uwsgi_modifier1 9;
+               uwsgi_pass unix:////var/run/luci-webui.socket;
+}
+location ~ /cgi-bin/cgi-(backup|download|upload) {
+               include uwsgi_params;
+               uwsgi_param SERVER_ADDR $server_addr;
+               uwsgi_modifier1 9;
+               uwsgi_pass unix:////var/run/luci-cgi_io.socket;
 }
 
 location /luci-static {