diff options
| author | Quentin Dufour <quentin@deuxfleurs.fr> | 2020-03-04 11:43:33 +0100 |
|---|---|---|
| committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2020-03-04 11:43:33 +0100 |
| commit | aeda90a8dac80fea2441ffbad0ef15962adf868f (patch) | |
| tree | 5695279e83f06460e4ac04c4df63cf753a0b9d9d /consul/configuration/chat | |
| parent | 163472bed90d2514e38ca9e3659fa3afe06a9f2e (diff) | |
| parent | 1667c4c5ce4aeec06530e4179e198d8650c5d92a (diff) | |
| download | infrastructure-aeda90a8dac80fea2441ffbad0ef15962adf868f.tar.gz infrastructure-aeda90a8dac80fea2441ffbad0ef15962adf868f.zip | |
Merge branch 'easybridge'
Diffstat (limited to 'consul/configuration/chat')
| -rw-r--r-- | consul/configuration/chat/easybridge/config.json.tpl | 17 | ||||
| -rw-r--r-- | consul/configuration/chat/easybridge/registration.yaml.tpl | 14 | ||||
| -rw-r--r-- | consul/configuration/chat/synapse/homeserver.yaml | 3 |
3 files changed, 33 insertions, 1 deletions
diff --git a/consul/configuration/chat/easybridge/config.json.tpl b/consul/configuration/chat/easybridge/config.json.tpl new file mode 100644 index 0000000..40ecc44 --- /dev/null +++ b/consul/configuration/chat/easybridge/config.json.tpl @@ -0,0 +1,17 @@ +{ + "log_level": "info", + "easybridge_avatar": "/app/easybridge.jpg", + + "web_bind_addr": "0.0.0.0:8281", + "web_url": "https://easybridge.deuxfleurs.fr", + "web_session_key": "{{ key "secrets/chat/easybridge/web_session_key" | trimSpace }}", + + "appservice_bind_addr": "0.0.0.0:8321", + "registration": "/data/registration.yaml", + "homeserver_url": "https://im.deuxfleurs.fr", + "matrix_domain": "deuxfleurs.fr", + "name_format": "{}_ezbr_", + + "db_type": "postgres", + "db_path": "host=psql-proxy.service.2.cluster.deuxfleurs.fr port=5432 user={{ key "secrets/chat/easybridge/db_user" | trimSpace }} dbname=easybridge password={{ key "secrets/chat/easybridge/db_pass" | trimSpace }} sslmode=disable" +} diff --git a/consul/configuration/chat/easybridge/registration.yaml.tpl b/consul/configuration/chat/easybridge/registration.yaml.tpl new file mode 100644 index 0000000..ec098fd --- /dev/null +++ b/consul/configuration/chat/easybridge/registration.yaml.tpl @@ -0,0 +1,14 @@ +id: Easybridge +url: http://easybridge-api.service.2.cluster.deuxfleurs.fr:8321 +as_token: {{ key "secrets/chat/easybridge/as_token" | trimSpace }} +hs_token: {{ key "secrets/chat/easybridge/hs_token" | trimSpace }} +sender_localpart: _ezbr_ +rate_limited: false +namespaces: + users: + - exclusive: true + regex: '@.*_ezbr_' + aliases: + - exclusive: true + regex: '#.*_ezbr_' + rooms: [] 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> |