summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2021-03-30 12:12:44 +0100
committerGitHub <noreply@github.com>2021-03-30 12:12:44 +0100
commitf02663c4ddfa259c96aebde848a83156540c9fb3 (patch)
tree00667a26bc8f9cbda98a3ea0f6d6312476489f34 /docker
parentMake RateLimiter class check for ratelimit overrides (#9711) (diff)
downloadsynapse-f02663c4ddfa259c96aebde848a83156540c9fb3.tar.xz
Replace `room_invite_state_types` with `room_prejoin_state` (#9700)
`room_invite_state_types` was inconvenient as a configuration setting, because
anyone that ever set it would not receive any new types that were added to the
defaults. Here, we deprecate the old setting, and replace it with a couple of
new settings under `room_prejoin_state`.
Diffstat (limited to 'docker')
-rw-r--r--docker/conf/homeserver.yaml8
1 files changed, 0 insertions, 8 deletions
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml
index 0dea62a87d..a792899540 100644
--- a/docker/conf/homeserver.yaml
+++ b/docker/conf/homeserver.yaml
@@ -173,18 +173,10 @@ report_stats: False
 
 ## API Configuration ##
 
-room_invite_state_types:
-    - "m.room.join_rules"
-    - "m.room.canonical_alias"
-    - "m.room.avatar"
-    - "m.room.name"
-
 {% if SYNAPSE_APPSERVICES %}
 app_service_config_files:
 {% for appservice in SYNAPSE_APPSERVICES %}    - "{{ appservice }}"
 {% endfor %}
-{% else %}
-app_service_config_files: []
 {% endif %}
 
 macaroon_secret_key: "{{ SYNAPSE_MACAROON_SECRET_KEY }}"