Merge branch 'main' into auto_join_room_list

added env to configure several auto_join_rooms
2025-10-28 16:14:13 +00:00 · 2025-10-28 17:12:33 +01:00
3 changed files with 10 additions and 0 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.yml
+++ b/compose.yml
@ -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
--- 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