MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #654: Increased default upload limit from 30 to 100MB

This commit is contained in:
Eliot Berriot 2019-01-11 09:51:23 +01:00
parent 15e4815564
commit 5cbd92dcb0
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
7 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -120,7 +120,7 @@ Then, add the following block at the end of your docker-compose.yml file::
- .env - .env
environment: environment:
# Override those variables in your .env file if needed # Override those variables in your .env file if needed
- "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-30M}" - "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-100M}"
volumes: volumes:
- "./nginx/funkwhale.template:/etc/nginx/conf.d/funkwhale.template:ro" - "./nginx/funkwhale.template:/etc/nginx/conf.d/funkwhale.template:ro"
- "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro" - "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro"

1
changes/changelog.d/654.enhancement Normal file
View File

@ -0,0 +1 @@
Increased default upload limit from 30 to 100MB (#654)

4
deploy/apache.conf
View File

@ -72,8 +72,8 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
ProxyPass "/api/v1/activity" ${funkwhale-api-ws}/api/v1/activity ProxyPass "/api/v1/activity" ${funkwhale-api-ws}/api/v1/activity
<Location "/api"> <Location "/api">
# similar to nginx 'client_max_body_size 30M;' # similar to nginx 'client_max_body_size 100M;'
LimitRequestBody 31457280 LimitRequestBody 104857600
ProxyPass ${funkwhale-api}/api ProxyPass ${funkwhale-api}/api
ProxyPassReverse ${funkwhale-api}/api ProxyPassReverse ${funkwhale-api}/api

2
deploy/docker-compose.yml
View File

@ -68,7 +68,7 @@ services:
- .env - .env
environment: environment:
# Override those variables in your .env file if needed # Override those variables in your .env file if needed
- "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-30M}" - "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-100M}"
volumes: volumes:
- "./nginx/funkwhale.template:/etc/nginx/conf.d/funkwhale.template:ro" - "./nginx/funkwhale.template:/etc/nginx/conf.d/funkwhale.template:ro"
- "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro" - "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro"

2
deploy/env.prod.sample
View File

@ -135,4 +135,4 @@ MUSIC_DIRECTORY_SERVE_PATH=/srv/funkwhale/data/music
FUNKWHALE_FRONTEND_PATH=/srv/funkwhale/front/dist FUNKWHALE_FRONTEND_PATH=/srv/funkwhale/front/dist
# Nginx related configuration # Nginx related configuration
NGINX_MAX_BODY_SIZE=30M NGINX_MAX_BODY_SIZE=100M

2
dev.yml
View File

@ -94,7 +94,7 @@ services:
- .env - .env
image: nginx image: nginx
environment: environment:
- "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-30M}" - "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-100M}"
- "FUNKWHALE_API_IP=${FUNKHALE_API_IP-api}" - "FUNKWHALE_API_IP=${FUNKHALE_API_IP-api}"
- "FUNKWHALE_API_PORT=${FUNKWHALE_API_PORT-5000}" - "FUNKWHALE_API_PORT=${FUNKWHALE_API_PORT-5000}"
- "FUNKWHALE_FRONT_IP=${FUNKHALE_FRONT_IP-front}" - "FUNKWHALE_FRONT_IP=${FUNKHALE_FRONT_IP-front}"

2
docker/nginx/conf.dev
View File

@ -41,7 +41,7 @@ http {
server { server {
listen 80; listen 80;
charset utf-8; charset utf-8;
client_max_body_size 30M; client_max_body_size 100M;
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
# compression settings # compression settings
gzip on; gzip on;