revert to recipe state of v6.8.0 #55

Merged
val merged 1 commits from revert-changes into main 2026-01-15 15:48:56 +00:00
5 changed files with 6 additions and 12 deletions

View File

@ -39,9 +39,7 @@ PASSWORD_LOGIN_ENABLED=true
## Room auto-join
#AUTO_JOIN_ROOM_ENABLED=1
#AUTO_JOIN_ROOM is deprecated, but kept for backward compatibility. Please use only one, and prefer AUTO_JOIN_ROOM_LIST.
#AUTO_JOIN_ROOM="#example:example.com"
#AUTO_JOIN_ROOM_LIST="[\"#room1:example.com\",\"#room2:example.com\"]"
## Logging
@ -88,8 +86,6 @@ RETENTION_MAX_LIFETIME=4w
#MEDIA_RETENTION_LOCAL_LIFETIME=30d
#MEDIA_RETENTION_REMOTE_LIFETIME=14d
MAX_UPLOAD_SIZE=50M
## Old Signing Key
#OLD_SIGNING_KEY_ID=a_OLDKEYID
#OLD_SIGNING_KEY=base64string

View File

@ -1,11 +1,11 @@
export DISCORD_BRIDGE_YAML_VERSION=v2
export ENTRYPOINT_CONF_VERSION=v3
export HOMESERVER_YAML_VERSION=v34
export HOMESERVER_YAML_VERSION=v35
export LOG_CONFIG_VERSION=v2
export SHARED_SECRET_AUTH_VERSION=v2
export SIGNAL_BRIDGE_YAML_VERSION=v6
export TELEGRAM_BRIDGE_YAML_VERSION=v6
export NGINX_CONFIG_VERSION=v11
export NGINX_CONFIG_VERSION=v12
export WK_SERVER_VERSION=v1
export WK_CLIENT_VERSION=v1
export PG_BACKUP_VERSION=v1

View File

@ -49,7 +49,6 @@ services:
- ALLOWED_LIFETIME_MAX
- ALLOW_PUBLIC_ROOMS_FEDERATION
- AUTO_JOIN_ROOM
- AUTO_JOIN_ROOM_LIST
- AUTO_JOIN_ROOM_ENABLED
- DISABLE_FEDERATION
- DOMAIN
@ -92,7 +91,6 @@ services:
- LOGIN_LIMIT_ACCOUNT_PER_SECOND=${LOGIN_LIMIT_ACCOUNT_PER_SECOND:-0.003}
- LOGIN_LIMIT_ACCOUNT_BURST=${LOGIN_LIMIT_ACCOUNT_BURST:-5}
- WEB_CLIENT_LOCATION
- MAX_UPLOAD_SIZE
networks:
- internal
entrypoint: /docker-entrypoint.sh

View File

@ -130,7 +130,7 @@ log_config: "/data/log.config"
media_store_path: "/data/media_store"
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#max_upload_size
max_upload_size: {{ or (env "MAX_UPLOAD_SIZE") 50M }}
max_upload_size: 50M
# https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#turn
{{ if eq (env "TURN_ENABLED") "1" }}

View File

@ -28,7 +28,7 @@ http {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $host;
client_max_body_size {{ or (env "MAX_UPLOAD_SIZE") "50M" }};
client_max_body_size 50M;
proxy_http_version 1.1;
}
@ -37,7 +37,7 @@ http {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $host;
client_max_body_size {{ or (env "MAX_UPLOAD_SIZE") "50M" }};
client_max_body_size 50M;
proxy_http_version 1.1;
}
@ -56,7 +56,7 @@ http {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $host;
client_max_body_size {{ or (env "MAX_UPLOAD_SIZE") "50M" }};
client_max_body_size 50M;
proxy_http_version 1.1;
}
{{ end }}