Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
JuniorJPDJ
funkwhale
Commits
5cbd92dc
Verified
Commit
5cbd92dc
authored
Jan 11, 2019
by
Eliot Berriot
Browse files
Fix #654: Increased default upload limit from 30 to 100MB
parent
15e48155
Changes
7
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
5cbd92dc
...
...
@@ -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-
3
0M}"
- "NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-
10
0M}"
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 → 100644
View file @
5cbd92dc
Increased default upload limit from 30 to 100MB (#654)
deploy/apache.conf
View file @
5cbd92dc
...
...
@@ -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
3
0M;'
LimitRequestBody
3145728
0
# similar to nginx 'client_max_body_size
10
0M;'
LimitRequestBody
10485760
0
ProxyPass
${
funkwhale
-
api
}/
api
ProxyPassReverse
${
funkwhale
-
api
}/
api
...
...
deploy/docker-compose.yml
View file @
5cbd92dc
...
...
@@ -68,7 +68,7 @@ services:
-
.env
environment
:
# Override those variables in your .env file if needed
-
"
NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-
3
0M}"
-
"
NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-
10
0M}"
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
View file @
5cbd92dc
...
...
@@ -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=
3
0M
NGINX_MAX_BODY_SIZE=
10
0M
dev.yml
View file @
5cbd92dc
...
...
@@ -94,7 +94,7 @@ services:
-
.env
image
:
nginx
environment
:
-
"
NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-
3
0M}"
-
"
NGINX_MAX_BODY_SIZE=${NGINX_MAX_BODY_SIZE-
10
0M}"
-
"
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
View file @
5cbd92dc
...
...
@@ -41,7 +41,7 @@ http {
server {
listen 80;
charset utf-8;
client_max_body_size
3
0M;
client_max_body_size
10
0M;
include /etc/nginx/funkwhale_proxy.conf;
# compression settings
gzip on;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment