Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7482 from sotux/master

Browse source 
nginx: unified indentation character and add additional configure directory
This commit is contained in:
Ted Hess 2018-12-11 20:16:55 -05:00 committed by GitHub
commit cd64c54b2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/nginx/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nginx PKG_NAME:=nginx
PKG_VERSION:=1.15.7 PKG_VERSION:=1.15.7
PKG_RELEASE:=1 PKG_RELEASE:=2
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/

24
net/nginx/files-luci-support/luci_nginx.conf
View file

@ -18,13 +18,13 @@ http {
include mime.types; include mime.types;
default_type application/octet-stream; default_type application/octet-stream;
sendfile on; sendfile on;
keepalive_timeout 0; keepalive_timeout 0;
client_body_buffer_size 10K; client_body_buffer_size 10K;
client_header_buffer_size 1k; client_header_buffer_size 1k;
client_max_body_size 1G; client_max_body_size 1G;
large_client_header_buffers 2 1k; large_client_header_buffers 2 1k;
gzip on; gzip on;
gzip_http_version 1.1; gzip_http_version 1.1;
@ -32,18 +32,20 @@ http {
gzip_comp_level 1; gzip_comp_level 1;
gzip_proxied any; gzip_proxied any;
root /www; root /www;
server { server {
listen 80 default_server; listen 80 default_server;
listen [::]:80 default_server; listen [::]:80 default_server;
server_name localhost; server_name localhost;
location ~* .(jpg|jpeg|png|gif|ico|css|js)$ { location ~* .(jpg|jpeg|png|gif|ico|css|js)$ {
expires 365d; expires 365d;
} }
include luci_uwsgi.conf; include luci_uwsgi.conf;
} }
include /etc/nginx/conf.d/*.conf;
} }

42
net/nginx/files-luci-support/luci_nginx_ssl.conf
View file

@ -18,13 +18,13 @@ http {
include mime.types; include mime.types;
default_type application/octet-stream; default_type application/octet-stream;
sendfile on; sendfile on;
keepalive_timeout 0; keepalive_timeout 0;
client_body_buffer_size 10K; client_body_buffer_size 10K;
client_header_buffer_size 1k; client_header_buffer_size 1k;
client_max_body_size 1G; client_max_body_size 1G;
large_client_header_buffers 2 1k; large_client_header_buffers 2 1k;
gzip on; gzip on;
gzip_http_version 1.1; gzip_http_version 1.1;
@ -32,33 +32,35 @@ http {
gzip_comp_level 1; gzip_comp_level 1;
gzip_proxied any; gzip_proxied any;
root /www; root /www;
server { server {
listen 80 default_server; listen 80 default_server;
listen [::]:80 default_server; listen [::]:80 default_server;
server_name _; server_name _;
return 301 https://$host$request_uri; return 301 https://$host$request_uri;
} }
server { server {
listen 443 ssl default_server; listen 443 ssl default_server;
listen [::]:443 ssl default_server; listen [::]:443 ssl default_server;
server_name localhost; server_name localhost;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_prefer_server_ciphers on; ssl_prefer_server_ciphers on;
ssl_ciphers "EECDH+ECDSA+AESGCM:EECDH+aRSA+AESGCM:EECDH+ECDSA+SHA384:EECDH+ECDSA+SHA256:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:DHE+AESGCM:DHE:!RSA!aNULL:!eNULL:!LOW:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!CAMELLIA:!SEED"; ssl_ciphers "EECDH+ECDSA+AESGCM:EECDH+aRSA+AESGCM:EECDH+ECDSA+SHA384:EECDH+ECDSA+SHA256:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:DHE+AESGCM:DHE:!RSA!aNULL:!eNULL:!LOW:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!CAMELLIA:!SEED";
ssl_session_tickets off; ssl_session_tickets off;
ssl_certificate /etc/nginx/nginx.cer; ssl_certificate /etc/nginx/nginx.cer;
ssl_certificate_key /etc/nginx/nginx.key; ssl_certificate_key /etc/nginx/nginx.key;
location ~* .(jpg|jpeg|png|gif|ico|css|js)$ { location ~* .(jpg|jpeg|png|gif|ico|css|js)$ {
expires 365d; expires 365d;
} }
include luci_uwsgi.conf; include luci_uwsgi.conf;
} }
include /etc/nginx/conf.d/*.conf;
} }

30
net/nginx/files-luci-support/luci_uwsgi.conf
View file

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