aboutsummaryrefslogtreecommitdiff
path: root/consul/configuration/chat/synapse/homeserver.yaml
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2020-03-04 11:43:33 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2020-03-04 11:43:33 +0100
commitaeda90a8dac80fea2441ffbad0ef15962adf868f (patch)
tree5695279e83f06460e4ac04c4df63cf753a0b9d9d /consul/configuration/chat/synapse/homeserver.yaml
parent163472bed90d2514e38ca9e3659fa3afe06a9f2e (diff)
parent1667c4c5ce4aeec06530e4179e198d8650c5d92a (diff)
downloadinfrastructure-aeda90a8dac80fea2441ffbad0ef15962adf868f.tar.gz
infrastructure-aeda90a8dac80fea2441ffbad0ef15962adf868f.zip
Merge branch 'easybridge'
Diffstat (limited to 'consul/configuration/chat/synapse/homeserver.yaml')
-rw-r--r--consul/configuration/chat/synapse/homeserver.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/consul/configuration/chat/synapse/homeserver.yaml b/consul/configuration/chat/synapse/homeserver.yaml
index c54d4a0..0534235 100644
--- a/consul/configuration/chat/synapse/homeserver.yaml
+++ b/consul/configuration/chat/synapse/homeserver.yaml
@@ -308,7 +308,8 @@ room_invite_state_types:
# A list of application service config file to use
app_service_config_files:
- - "/etc/matrix-synapse/fb2mx_registration.yaml"
+ - "/etc/matrix-synapse/easybridge_registration.yaml"
+ #- "/etc/matrix-synapse/fb2mx_registration.yaml"
# macaroon_secret_key: <PRIVATE STRING>