Use the custom files method for client size
This commit is contained in:
parent
b619d78154
commit
fc4f81cf5c
@ -41,9 +41,3 @@ $ pip install -r requirements.txt
|
|||||||
$ git remote add dokku dokku@dokku.autonomic.zone:minio
|
$ git remote add dokku dokku@dokku.autonomic.zone:minio
|
||||||
$ git push dokku
|
$ git push dokku
|
||||||
```
|
```
|
||||||
|
|
||||||
## Custom NGINX Configuration
|
|
||||||
|
|
||||||
In order to have closer control on the proxy between Minio and Nginx, we setup
|
|
||||||
a [nginx.conf.sigil](./nginx.conf.sigil) which overrides the default Dokku
|
|
||||||
based template and configures things such as maximum allowed file size.
|
|
||||||
|
@ -44,3 +44,20 @@
|
|||||||
mappings:
|
mappings:
|
||||||
- "https:443:{{ http_port }}"
|
- "https:443:{{ http_port }}"
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
|
- name: Create Nginx customisation directory
|
||||||
|
file:
|
||||||
|
path: /home/dokku/minio/nginx.conf.d/
|
||||||
|
state: directory
|
||||||
|
owner: dokku
|
||||||
|
group: dokku
|
||||||
|
with_items:
|
||||||
|
become: true
|
||||||
|
|
||||||
|
- name: Copy over the Nginx custom upload file
|
||||||
|
template:
|
||||||
|
src: upload.conf.j2
|
||||||
|
dest: /home/dokku/minio/nginx.conf.d/upload.conf
|
||||||
|
owner: dokku
|
||||||
|
group: dokku
|
||||||
|
become: true
|
||||||
|
1
ansible/templates/upload.conf.j2
Normal file
1
ansible/templates/upload.conf.j2
Normal file
@ -0,0 +1 @@
|
|||||||
|
client_max_body_size {{ nginx_max_body_size }};
|
@ -1,4 +1,5 @@
|
|||||||
---
|
---
|
||||||
domain: "minio.autonomic.zone"
|
|
||||||
autonomic_admin_mail: "helo@autonomic.zone"
|
autonomic_admin_mail: "helo@autonomic.zone"
|
||||||
|
domain: "minio.autonomic.zone"
|
||||||
http_port: "9000"
|
http_port: "9000"
|
||||||
|
nginx_max_body_size: "100m"
|
||||||
|
167
nginx.conf.sigil
167
nginx.conf.sigil
@ -1,167 +0,0 @@
|
|||||||
{{ range $port_map := .PROXY_PORT_MAP | split " " }}
|
|
||||||
{{ $port_map_list := $port_map | split ":" }}
|
|
||||||
{{ $scheme := index $port_map_list 0 }}
|
|
||||||
{{ $listen_port := index $port_map_list 1 }}
|
|
||||||
{{ $upstream_port := index $port_map_list 2 }}
|
|
||||||
|
|
||||||
{{ if eq $scheme "http" }}
|
|
||||||
server {
|
|
||||||
listen [{{ $.NGINX_BIND_ADDRESS_IP6 }}]:{{ $listen_port }};
|
|
||||||
listen {{ if $.NGINX_BIND_ADDRESS_IP4 }}{{ $.NGINX_BIND_ADDRESS_IP4 }}:{{end}}{{ $listen_port }};
|
|
||||||
{{ if $.NOSSL_SERVER_NAME }}server_name {{ $.NOSSL_SERVER_NAME }}; {{ end }}
|
|
||||||
access_log {{ $.NGINX_LOG_ROOT }}/{{ $.APP }}-access.log;
|
|
||||||
error_log {{ $.NGINX_LOG_ROOT }}/{{ $.APP }}-error.log;
|
|
||||||
{{ if (and (eq $listen_port "80") ($.SSL_INUSE)) }}
|
|
||||||
return 301 https://$host:{{ $.PROXY_SSL_PORT }}$request_uri;
|
|
||||||
{{ else }}
|
|
||||||
location / {
|
|
||||||
|
|
||||||
gzip on;
|
|
||||||
gzip_min_length 1100;
|
|
||||||
gzip_buffers 4 32k;
|
|
||||||
gzip_types text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml application/rss+xml font/truetype application/x-font-ttf font/opentype application/vnd.ms-fontobject image/svg+xml;
|
|
||||||
gzip_vary on;
|
|
||||||
gzip_comp_level 6;
|
|
||||||
|
|
||||||
client_max_body_size 100m;
|
|
||||||
|
|
||||||
proxy_pass http://{{ $.APP }}-{{ $upstream_port }};
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection $http_connection;
|
|
||||||
proxy_set_header Host $http_host;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
proxy_set_header X-Forwarded-For $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-Port $server_port;
|
|
||||||
proxy_set_header X-Request-Start $msec;
|
|
||||||
}
|
|
||||||
include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
|
|
||||||
|
|
||||||
error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html;
|
|
||||||
location /400-error.html {
|
|
||||||
root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors;
|
|
||||||
internal;
|
|
||||||
}
|
|
||||||
|
|
||||||
error_page 404 /404-error.html;
|
|
||||||
location /404-error.html {
|
|
||||||
root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors;
|
|
||||||
internal;
|
|
||||||
}
|
|
||||||
|
|
||||||
error_page 500 501 502 503 504 505 506 507 508 509 510 511 /500-error.html;
|
|
||||||
location /500-error.html {
|
|
||||||
root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors;
|
|
||||||
internal;
|
|
||||||
}
|
|
||||||
{{ end }}
|
|
||||||
}
|
|
||||||
{{ else if eq $scheme "https"}}
|
|
||||||
server {
|
|
||||||
listen [{{ $.NGINX_BIND_ADDRESS_IP6 }}]:{{ $listen_port }} ssl {{ if eq $.HTTP2_SUPPORTED "true" }}http2{{ else if eq $.SPDY_SUPPORTED "true" }}spdy{{ end }};
|
|
||||||
listen {{ if $.NGINX_BIND_ADDRESS_IP4 }}{{ $.NGINX_BIND_ADDRESS_IP4 }}:{{end}}{{ $listen_port }} ssl {{ if eq $.HTTP2_SUPPORTED "true" }}http2{{ else if eq $.SPDY_SUPPORTED "true" }}spdy{{ end }};
|
|
||||||
{{ if $.SSL_SERVER_NAME }}server_name {{ $.SSL_SERVER_NAME }}; {{ end }}
|
|
||||||
{{ if $.NOSSL_SERVER_NAME }}server_name {{ $.NOSSL_SERVER_NAME }}; {{ end }}
|
|
||||||
access_log {{ $.NGINX_LOG_ROOT }}/{{ $.APP }}-access.log;
|
|
||||||
error_log {{ $.NGINX_LOG_ROOT }}/{{ $.APP }}-error.log;
|
|
||||||
|
|
||||||
ssl_certificate {{ $.APP_SSL_PATH }}/server.crt;
|
|
||||||
ssl_certificate_key {{ $.APP_SSL_PATH }}/server.key;
|
|
||||||
ssl_protocols TLSv1.2 {{ if eq $.TLS13_SUPPORTED "true" }}TLSv1.3{{ end }};
|
|
||||||
ssl_prefer_server_ciphers off;
|
|
||||||
|
|
||||||
keepalive_timeout 70;
|
|
||||||
{{ if and (eq $.SPDY_SUPPORTED "true") (ne $.HTTP2_SUPPORTED "true") }}add_header Alternate-Protocol {{ $.PROXY_SSL_PORT }}:npn-spdy/2;{{ end }}
|
|
||||||
|
|
||||||
location / {
|
|
||||||
|
|
||||||
gzip on;
|
|
||||||
gzip_min_length 1100;
|
|
||||||
gzip_buffers 4 32k;
|
|
||||||
gzip_types text/css text/javascript text/xml text/plain text/x-component application/javascript application/x-javascript application/json application/xml application/rss+xml font/truetype application/x-font-ttf font/opentype application/vnd.ms-fontobject image/svg+xml;
|
|
||||||
gzip_vary on;
|
|
||||||
gzip_comp_level 6;
|
|
||||||
|
|
||||||
proxy_pass http://{{ $.APP }}-{{ $upstream_port }};
|
|
||||||
{{ if eq $.HTTP2_PUSH_SUPPORTED "true" }}http2_push_preload on; {{ end }}
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection $http_connection;
|
|
||||||
proxy_set_header Host $http_host;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
proxy_set_header X-Forwarded-For $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-Port $server_port;
|
|
||||||
proxy_set_header X-Request-Start $msec;
|
|
||||||
}
|
|
||||||
include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
|
|
||||||
|
|
||||||
error_page 400 401 402 403 405 406 407 408 409 410 411 412 413 414 415 416 417 418 420 422 423 424 426 428 429 431 444 449 450 451 /400-error.html;
|
|
||||||
location /400-error.html {
|
|
||||||
root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors;
|
|
||||||
internal;
|
|
||||||
}
|
|
||||||
|
|
||||||
error_page 404 /404-error.html;
|
|
||||||
location /404-error.html {
|
|
||||||
root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors;
|
|
||||||
internal;
|
|
||||||
}
|
|
||||||
|
|
||||||
error_page 500 501 503 504 505 506 507 508 509 510 511 /500-error.html;
|
|
||||||
location /500-error.html {
|
|
||||||
root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors;
|
|
||||||
internal;
|
|
||||||
}
|
|
||||||
|
|
||||||
error_page 502 /502-error.html;
|
|
||||||
location /502-error.html {
|
|
||||||
root {{ $.DOKKU_LIB_ROOT }}/data/nginx-vhosts/dokku-errors;
|
|
||||||
internal;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
{{ else if eq $scheme "grpc"}}
|
|
||||||
{{ if eq $.GRPC_SUPPORTED "true"}}{{ if eq $.HTTP2_SUPPORTED "true"}}
|
|
||||||
server {
|
|
||||||
listen [{{ $.NGINX_BIND_ADDRESS_IP6 }}]:{{ $listen_port }} http2;
|
|
||||||
listen {{ if $.NGINX_BIND_ADDRESS_IP4 }}{{ $.NGINX_BIND_ADDRESS_IP4 }}:{{end}}{{ $listen_port }} http2;
|
|
||||||
{{ if $.NOSSL_SERVER_NAME }}server_name {{ $.NOSSL_SERVER_NAME }}; {{ end }}
|
|
||||||
access_log {{ $.NGINX_LOG_ROOT }}/{{ $.APP }}-access.log;
|
|
||||||
error_log {{ $.NGINX_LOG_ROOT }}/{{ $.APP }}-error.log;
|
|
||||||
location / {
|
|
||||||
grpc_pass grpc://{{ $.APP }}-{{ $upstream_port }};
|
|
||||||
}
|
|
||||||
include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
|
|
||||||
}
|
|
||||||
{{ end }}{{ end }}
|
|
||||||
{{ else if eq $scheme "grpcs"}}
|
|
||||||
{{ if eq $.GRPC_SUPPORTED "true"}}{{ if eq $.HTTP2_SUPPORTED "true"}}
|
|
||||||
server {
|
|
||||||
listen [{{ $.NGINX_BIND_ADDRESS_IP6 }}]:{{ $listen_port }} ssl http2;
|
|
||||||
listen {{ if $.NGINX_BIND_ADDRESS_IP4 }}{{ $.NGINX_BIND_ADDRESS_IP4 }}:{{end}}{{ $listen_port }} ssl http2;
|
|
||||||
{{ if $.NOSSL_SERVER_NAME }}server_name {{ $.NOSSL_SERVER_NAME }}; {{ end }}
|
|
||||||
access_log {{ $.NGINX_LOG_ROOT }}/{{ $.APP }}-access.log;
|
|
||||||
error_log {{ $.NGINX_LOG_ROOT }}/{{ $.APP }}-error.log;
|
|
||||||
|
|
||||||
ssl_certificate {{ $.APP_SSL_PATH }}/server.crt;
|
|
||||||
ssl_certificate_key {{ $.APP_SSL_PATH }}/server.key;
|
|
||||||
ssl_protocols TLSv1.2 {{ if eq $.TLS13_SUPPORTED "true" }}TLSv1.3{{ end }};
|
|
||||||
ssl_prefer_server_ciphers off;
|
|
||||||
|
|
||||||
location / {
|
|
||||||
grpc_pass grpc://{{ $.APP }}-{{ $upstream_port }};
|
|
||||||
}
|
|
||||||
include {{ $.DOKKU_ROOT }}/{{ $.APP }}/nginx.conf.d/*.conf;
|
|
||||||
}
|
|
||||||
{{ end }}{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
{{ end }}
|
|
||||||
|
|
||||||
{{ if $.DOKKU_APP_WEB_LISTENERS }}
|
|
||||||
{{ range $upstream_port := $.PROXY_UPSTREAM_PORTS | split " " }}
|
|
||||||
upstream {{ $.APP }}-{{ $upstream_port }} {
|
|
||||||
{{ range $listeners := $.DOKKU_APP_WEB_LISTENERS | split " " }}
|
|
||||||
{{ $listener_list := $listeners | split ":" }}
|
|
||||||
{{ $listener_ip := index $listener_list 0 }}
|
|
||||||
server {{ $listener_ip }}:{{ $upstream_port }};{{ end }}
|
|
||||||
}
|
|
||||||
{{ end }}{{ end }}
|
|
Reference in New Issue
Block a user