Merge branch '6.8.1fix'

chore: publish 6.8.1+v1.139.2 release
Merge pull request 'added env to configure several auto_join_rooms' (#52 ) from auto_join_room_list into main
2025-10-29 13:55:54 +01:00 · 2025-10-28 17:17:22 +01:00 · 2025-10-28 16:14:38 +00:00 · 2025-10-28 16:14:13 +00:00 · 2025-10-28 17:12:33 +01:00 · 2025-10-17 17:05:30 +00:00
2 changed files with 3 additions and 2 deletions
--- a/compose.yml
+++ b/compose.yml
@ -91,6 +91,7 @@ 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
@ -106,7 +107,7 @@ services:
      restart_policy:
        condition: on-failure
      labels:
-        - "coop-cloud.${STACK_NAME}.version=6.8.0+v1.139.2"
+        - "coop-cloud.${STACK_NAME}.version=6.8.1+v1.139.2"
        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
    healthcheck:
      test: ["CMD", "curl", "-f", "http://localhost:8008/health"]
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@ -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: 50M
+max_upload_size: {{ or (env "MAX_UPLOAD_SIZE") 50M }}

 # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#turn
 {{ if eq (env "TURN_ENABLED") "1" }}
Author	SHA1	Message	Date
val	3e0c9063c4	Merge branch '6.8.1fix' All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-10-29 13:55:54 +01:00
vdietrich	24f7e0cb35	chore: publish 6.8.1+v1.139.2 release All checks were successful continuous-integration/drone/tag Build is passing Details continuous-integration/drone/push Build is passing Details	2025-10-28 17:17:22 +01:00
lambdabundesverband	6d1397562b	Merge pull request 'added env to configure several auto_join_rooms' (#52 ) from auto_join_room_list into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #52	2025-10-28 16:14:38 +00:00
lambdabundesverband	e0c0861c16	Merge branch 'main' into auto_join_room_list	2025-10-28 16:14:13 +00:00
vdietrich	41fdcafaa0	added env to configure several auto_join_rooms	2025-10-28 17:12:33 +01:00
Cassowary	730dbc4569	Merge pull request 'Expose max_upload_size as a configurable option' (#51 ) from cas_expose_maxupload into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #51 Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>	2025-10-17 17:05:30 +00:00
Cassowary	7703bbbce7	Bump config versions	2025-10-03 11:20:39 -07:00
Cassowary	e3df032bda	Expose max_upload_size as a configurable option	2025-10-02 11:40:51 -07:00