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

Merge pull request #9602 from dengqf6/ngx-br

Browse source 
nginx: update brotli module
This commit is contained in:
Daniel Engberg 2019-08-06 23:51:49 +02:00 committed by GitHub
commit b2f0cb973e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/nginx/Makefile
View file

@ -429,18 +429,18 @@ endif
ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y) ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
define Download/nginx-brotli define Download/nginx-brotli
VERSION:=e26248ee361c04e25f581b92b85d95681bdffb39 VERSION:=dc37f658ccb5a51d090dc09d1a2aca2f24309869
SUBDIR:=nginx-brotli SUBDIR:=nginx-brotli
FILE:=ngx-brotli-module-$$(VERSION).tar.gz FILE:=ngx-brotli-module-$$(VERSION).tar.xz
URL:=https://github.com/eustas/ngx_brotli.git URL:=https://github.com/eustas/ngx_brotli.git
MIRROR_HASH:=76b891ba49f82f0cfbc9cba875646e26ee986b522373e0aa2698a9923a4adcdb MIRROR_HASH:=6bc0c40ff24f6e0ac616dfddc803bdc7fcf54764ba9dc4f9cecb3a68beedcdaf
PROTO:=git PROTO:=git
endef endef
$(eval $(call Download,nginx-brotli)) $(eval $(call Download,nginx-brotli))
define Prepare/nginx-brotli define Prepare/nginx-brotli
$(eval $(Download/nginx-brotli)) $(eval $(Download/nginx-brotli))
gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
endef endef
endif endif

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

@ -20,7 +20,7 @@ http {
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;
@ -31,14 +31,15 @@ http {
gzip_vary on; gzip_vary on;
gzip_comp_level 1; gzip_comp_level 1;
gzip_proxied any; gzip_proxied any;
gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/javascript image/svg+xml;
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;
} }

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

@ -20,7 +20,7 @@ http {
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;
@ -31,9 +31,10 @@ http {
gzip_vary on; gzip_vary on;
gzip_comp_level 1; gzip_comp_level 1;
gzip_proxied any; gzip_proxied any;
gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/javascript image/svg+xml;
root /www; root /www;
server { server {
listen 80 default_server; listen 80 default_server;
listen [::]:80 default_server; listen [::]:80 default_server;
@ -45,7 +46,7 @@ http {
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";
@ -53,7 +54,7 @@ http {
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;
} }