Merge branch 'main' into auto_join_room_list

added env to configure several auto_join_rooms
Merge pull request 'Expose max_upload_size as a configurable option' (#51 ) from cas_expose_maxupload into main
2025-10-28 16:14:13 +00:00 · 2025-10-28 17:12:33 +01:00 · 2025-10-17 17:05:30 +00:00 · 2025-10-08 16:43:20 +02:00
5 changed files with 16 additions and 6 deletions
--- a/.env.sample
+++ b/.env.sample
@ -39,7 +39,9 @@ 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

--- a/compose.signal.yml
+++ b/compose.signal.yml
@ -10,7 +10,7 @@ services:
      - signal-data:/signal-data

  signalbridge:
-    image: dock.mau.dev/mautrix/signal:v0.8.4
+    image: dock.mau.dev/mautrix/signal:v0.8.7
    depends_on:
      - signaldb
    configs:
--- a/compose.telegram.yml
+++ b/compose.telegram.yml
@ -10,7 +10,7 @@ services:
      - telegram-data:/telegram-data

  telegrambridge:
-    image: dock.mau.dev/mautrix/telegram:v0.15.2
+    image: dock.mau.dev/mautrix/telegram:v0.15.3
    depends_on:
      - telegramdb
    configs:
--- a/compose.yml
+++ b/compose.yml
@ -3,7 +3,7 @@ version: "3.8"

 services:
  web:
-    image: nginx:1.29.0
+    image: nginx:1.29.2
    networks:
      - proxy
      - internal
@ -36,7 +36,7 @@ services:
      retries: 20

  app:
-    image: "matrixdotorg/synapse:v1.133.0"
+    image: "matrixdotorg/synapse:v1.139.2"
    volumes:
      - "data:/data"
    secrets:
@ -48,6 +48,7 @@ services:
      - ALLOWED_LIFETIME_MAX
      - ALLOW_PUBLIC_ROOMS_FEDERATION
      - AUTO_JOIN_ROOM
+      - AUTO_JOIN_ROOM_LIST
      - AUTO_JOIN_ROOM_ENABLED
      - DISABLE_FEDERATION
      - DOMAIN
@ -106,8 +107,8 @@ services:
      restart_policy:
        condition: on-failure
      labels:
-        - "coop-cloud.${STACK_NAME}.version=6.7.1+v1.133.0"
-        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
+        - "coop-cloud.${STACK_NAME}.version=6.8.0+v1.139.2"
+        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
    healthcheck:
      test: ["CMD", "curl", "-f", "http://localhost:8008/health"]
      interval: 30s
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@ -157,8 +157,15 @@ registration_shared_secret: {{ secret "registration" }}

 {{ if eq (env "AUTO_JOIN_ROOM_ENABLED") "1" }}
 # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#auto_join_rooms
+
+# AUTO_JOIN_ROOM only for backwards compatibility
+{{ if (env "AUTO_JOIN_ROOM") }}
 auto_join_rooms:
  - "{{ env "AUTO_JOIN_ROOM" }}"
+{{ else }}
+auto_join_rooms: {{ env "AUTO_JOIN_ROOM_LIST" }}
+{{ end }}
+
 {{ end }}

 # https://element-hq.github.io/synapse/latest/usage/configuration/config_documentation.html#session_lifetime
Author	SHA1	Message	Date
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
Simon	809055dadb	chore: publish 6.8.0+v1.139.2 release All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2025-10-08 16:43:20 +02:00