Merge pull request #6788 from Ansuel/fixnginx

nginx: improve luci config

net/nginx/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
 PKG_VERSION:=1.15.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://nginx.org/download/

net/nginx/files-luci-support/luci_nginx.conf

@@ -43,13 +43,7 @@ http {
 			expires 365d;
 		}
 
-        location / {
-            index  index.html;
-			include luci_uwsgi.conf;
-        }
-		
-		location /luci-static {
-			
-		}
+		include luci_uwsgi.conf;
+
     }
 }

net/nginx/files-luci-support/luci_nginx_ssl.conf

@@ -58,13 +58,7 @@ http {
 			expires 365d;
 		}
 
-        location / {
-            index  index.html;
-			include luci_uwsgi.conf;
-        }
-		
-		location /luci-static {
-			
-		}
+		include luci_uwsgi.conf;
+
     }
 }

net/nginx/files-luci-support/luci_uwsgi.conf

@@ -1,14 +1,20 @@
-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;
+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;
+}
+
+location /luci-static {
+}