Merge branch '654-upload-size' into 'develop'

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

Closes #654

See merge request funkwhale/funkwhale!526

CHANGELOG

@@ -120,7 +120,7 @@ Then, add the following block at the end of your docker-compose.yml file::
         - .env
       environment:
         # 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:
         - "./nginx/funkwhale.template:/etc/nginx/conf.d/funkwhale.template:ro"
         - "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro"

changes/changelog.d/654.enhancement

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

deploy/apache.conf

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

deploy/docker-compose.yml

@@ -68,7 +68,7 @@ services:
       - .env
     environment:
       # 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:
       - "./nginx/funkwhale.template:/etc/nginx/conf.d/funkwhale.template:ro"
       - "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro"

deploy/env.prod.sample

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

dev.yml

@@ -94,7 +94,7 @@ services:
       - .env
     image: nginx
     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_PORT=${FUNKWHALE_API_PORT-5000}"
       - "FUNKWHALE_FRONT_IP=${FUNKHALE_FRONT_IP-front}"

docker/nginx/conf.dev

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