nginx: improve luci config

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

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 28c36cb3b7f84d40ac347ce9414d2ab0df908167..4880f7dafb7ac5a3431ee1b6c531b11276608191 100644 (file)
--- a/net/nginx/Makefile
+++ b/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/

diff --git a/net/nginx/files-luci-support/luci_nginx.conf b/net/nginx/files-luci-support/luci_nginx.conf
index 53d4ab6c7fb7f1bbd30500705d8f0051f25602a6..8ef6e5944e4b3ceb6a144450da9de63716725cfc 100644 (file)
--- a/net/nginx/files-luci-support/luci_nginx.conf
+++ b/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;
+
     }
 }
\ No newline at end of file

diff --git a/net/nginx/files-luci-support/luci_nginx_ssl.conf b/net/nginx/files-luci-support/luci_nginx_ssl.conf
index 4647fecbf8c192583180a2a90ade1a8abcb9358e..8c8b53d65103ee7d798dde66d3951aa59228c5e9 100644 (file)
--- a/net/nginx/files-luci-support/luci_nginx_ssl.conf
+++ b/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;
+
     }
 }
\ No newline at end of file

diff --git a/net/nginx/files-luci-support/luci_uwsgi.conf b/net/nginx/files-luci-support/luci_uwsgi.conf
index eec66f4adc2e38261d4e83cc0375dff98efecb09..6bd1c4223d51678858e7cf7d1ae70aac0697acf6 100644 (file)
--- a/net/nginx/files-luci-support/luci_uwsgi.conf
+++ b/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;
\ No newline at end of file
+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 {
+}
\ No newline at end of file