cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10193 from Ansuel/nginx-sock

Browse Source 
nginx: adds new socket to luci uwsgi config
This commit is contained in:
Hannu Nyman
2019-10-12 14:46:06 +03:00
committed by GitHub
parent fd85ad0909 b9c7a570a2
commit 7de37d7fea
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/nginx/Makefile
+3 -1
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nginx PKG_NAME:=nginx
PKG_VERSION:=1.16.1 PKG_VERSION:=1.16.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nginx.org/download/ PKG_SOURCE_URL:=https://nginx.org/download/
@@ -196,6 +196,8 @@ ifneq ($(BUILD_VARIANT),all-module)
endif endif
ifneq ($(CONFIG_NGINX_HTTP_UWSGI),y) ifneq ($(CONFIG_NGINX_HTTP_UWSGI),y)
ADDITIONAL_MODULES += --without-http_uwsgi_module ADDITIONAL_MODULES += --without-http_uwsgi_module
else
config_files += uwsgi_params
endif endif
ifneq ($(CONFIG_NGINX_HTTP_SCGI),y) ifneq ($(CONFIG_NGINX_HTTP_SCGI),y)
ADDITIONAL_MODULES += --without-http_scgi_module ADDITIONAL_MODULES += --without-http_scgi_module
net/nginx/files-luci-support/luci_uwsgi.conf
+11 -15
View File
@@ -1,19 +1,15 @@
location /cgi-bin/luci { location /cgi-bin/luci {
index index.html; index index.html;
uwsgi_param QUERY_STRING $query_string; include uwsgi_params;
uwsgi_param REQUEST_METHOD $request_method; uwsgi_param SERVER_ADDR $server_addr;
uwsgi_param CONTENT_TYPE $content_type; uwsgi_modifier1 9;
uwsgi_param CONTENT_LENGTH $content_length if_not_empty; uwsgi_pass unix:////var/run/luci-webui.socket;
uwsgi_param REQUEST_URI $request_uri; }
uwsgi_param PATH_INFO $document_uri; location ~ /cgi-bin/cgi-(backup|download|upload) {
uwsgi_param SERVER_PROTOCOL $server_protocol; include uwsgi_params;
uwsgi_param REMOTE_ADDR $remote_addr; uwsgi_param SERVER_ADDR $server_addr;
uwsgi_param REMOTE_PORT $remote_port; uwsgi_modifier1 9;
uwsgi_param SERVER_ADDR $server_addr; uwsgi_pass unix:////var/run/luci-cgi_io.socket;
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 { location /luci-static {