Expose max_upload_size as a configurable option
This commit is contained in:
@ -86,6 +86,8 @@ RETENTION_MAX_LIFETIME=4w
|
|||||||
#MEDIA_RETENTION_LOCAL_LIFETIME=30d
|
#MEDIA_RETENTION_LOCAL_LIFETIME=30d
|
||||||
#MEDIA_RETENTION_REMOTE_LIFETIME=14d
|
#MEDIA_RETENTION_REMOTE_LIFETIME=14d
|
||||||
|
|
||||||
|
MAX_UPLOAD_SIZE=50M
|
||||||
|
|
||||||
## Old Signing Key
|
## Old Signing Key
|
||||||
#OLD_SIGNING_KEY_ID=a_OLDKEYID
|
#OLD_SIGNING_KEY_ID=a_OLDKEYID
|
||||||
#OLD_SIGNING_KEY=base64string
|
#OLD_SIGNING_KEY=base64string
|
||||||
|
@ -12,6 +12,7 @@ services:
|
|||||||
- STACK_NAME
|
- STACK_NAME
|
||||||
- NGINX_ACCESS_LOG_LOCATION
|
- NGINX_ACCESS_LOG_LOCATION
|
||||||
- NGINX_ERROR_LOG_LOCATION
|
- NGINX_ERROR_LOG_LOCATION
|
||||||
|
- MAX_UPLOAD_SIZE
|
||||||
configs:
|
configs:
|
||||||
- source: nginx_config
|
- source: nginx_config
|
||||||
target: /etc/nginx/nginx.conf
|
target: /etc/nginx/nginx.conf
|
||||||
@ -89,6 +90,7 @@ services:
|
|||||||
- LOGIN_LIMIT_ACCOUNT_PER_SECOND=${LOGIN_LIMIT_ACCOUNT_PER_SECOND:-0.003}
|
- LOGIN_LIMIT_ACCOUNT_PER_SECOND=${LOGIN_LIMIT_ACCOUNT_PER_SECOND:-0.003}
|
||||||
- LOGIN_LIMIT_ACCOUNT_BURST=${LOGIN_LIMIT_ACCOUNT_BURST:-5}
|
- LOGIN_LIMIT_ACCOUNT_BURST=${LOGIN_LIMIT_ACCOUNT_BURST:-5}
|
||||||
- WEB_CLIENT_LOCATION
|
- WEB_CLIENT_LOCATION
|
||||||
|
- MAX_UPLOAD_SIZE
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
entrypoint: /docker-entrypoint.sh
|
entrypoint: /docker-entrypoint.sh
|
||||||
|
@ -130,7 +130,7 @@ log_config: "/data/log.config"
|
|||||||
media_store_path: "/data/media_store"
|
media_store_path: "/data/media_store"
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#max_upload_size
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#max_upload_size
|
||||||
max_upload_size: 50M
|
max_upload_size: {{ or (env "MAX_UPLOAD_SIZE") 50M }}
|
||||||
|
|
||||||
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#turn
|
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#turn
|
||||||
{{ if eq (env "TURN_ENABLED") "1" }}
|
{{ if eq (env "TURN_ENABLED") "1" }}
|
||||||
|
@ -28,7 +28,7 @@ http {
|
|||||||
proxy_set_header X-Forwarded-For $remote_addr;
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
proxy_set_header X-Forwarded-Proto https;
|
proxy_set_header X-Forwarded-Proto https;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
client_max_body_size 50M;
|
client_max_body_size {{ or (env "MAX_UPLOAD_SIZE") "50M" }}
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -37,7 +37,7 @@ http {
|
|||||||
proxy_set_header X-Forwarded-For $remote_addr;
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
proxy_set_header X-Forwarded-Proto https;
|
proxy_set_header X-Forwarded-Proto https;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
client_max_body_size 50M;
|
client_max_body_size {{ or (env "MAX_UPLOAD_SIZE") "50M" }};
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,7 +56,7 @@ http {
|
|||||||
proxy_set_header X-Forwarded-For $remote_addr;
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
proxy_set_header X-Forwarded-Proto https;
|
proxy_set_header X-Forwarded-Proto https;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
client_max_body_size 50M;
|
client_max_body_size {{ or (env "MAX_UPLOAD_SIZE") "50M" }};
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
}
|
}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
Reference in New Issue
Block a user