Merge pull request #6788 from Ansuel/fixnginx

nginx: improve luci config
This commit is contained in:
Hannu Nyman 2018-08-20 18:04:05 +03:00 committed by GitHub
commit 70e991b394
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 31 deletions

View file

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

View file

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

View file

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

View file

@ -1,14 +1,20 @@
uwsgi_param QUERY_STRING $query_string; location /cgi-bin/luci {
uwsgi_param REQUEST_METHOD $request_method; index index.html;
uwsgi_param CONTENT_TYPE $content_type; uwsgi_param QUERY_STRING $query_string;
uwsgi_param CONTENT_LENGTH $content_length if_not_empty; uwsgi_param REQUEST_METHOD $request_method;
uwsgi_param REQUEST_URI $request_uri; uwsgi_param CONTENT_TYPE $content_type;
uwsgi_param PATH_INFO $document_uri; uwsgi_param CONTENT_LENGTH $content_length if_not_empty;
uwsgi_param SERVER_PROTOCOL $server_protocol; uwsgi_param REQUEST_URI $request_uri;
uwsgi_param REMOTE_ADDR $remote_addr; uwsgi_param PATH_INFO $document_uri;
uwsgi_param REMOTE_PORT $remote_port; uwsgi_param SERVER_PROTOCOL $server_protocol;
uwsgi_param SERVER_ADDR $server_addr; uwsgi_param REMOTE_ADDR $remote_addr;
uwsgi_param SERVER_PORT $server_port; uwsgi_param REMOTE_PORT $remote_port;
uwsgi_param SERVER_NAME $server_name; uwsgi_param SERVER_ADDR $server_addr;
uwsgi_modifier1 9; uwsgi_param SERVER_PORT $server_port;
uwsgi_pass unix:////var/run/uwsgi.sock; uwsgi_param SERVER_NAME $server_name;
uwsgi_modifier1 9;
uwsgi_pass unix:////var/run/uwsgi.sock;
}
location /luci-static {
}