From 155a9f7e4d96072c9a9afe35433b16156d5ddcb9 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Fri, 28 Feb 2020 20:08:37 +0100 Subject: Initial Easybridge setup --- consul/configuration/chat/easybridge/config.json.tpl | 13 +++++++++++++ consul/configuration/chat/easybridge/registration.yaml.tpl | 14 ++++++++++++++ consul/configuration/chat/synapse/homeserver.yaml | 1 + 3 files changed, 28 insertions(+) create mode 100644 consul/configuration/chat/easybridge/config.json.tpl create mode 100644 consul/configuration/chat/easybridge/registration.yaml.tpl (limited to 'consul') diff --git a/consul/configuration/chat/easybridge/config.json.tpl b/consul/configuration/chat/easybridge/config.json.tpl new file mode 100644 index 0000000..39ac9ee --- /dev/null +++ b/consul/configuration/chat/easybridge/config.json.tpl @@ -0,0 +1,13 @@ +{ + "log_level": "debug", + "appservice_bind_addr": "0.0.0.0:8321", + "web_bind_addr": "0.0.0.0:8281", + "web_url": "https://easybridge.deuxfleurs.fr", + "easybridge_avatar": "/app/easybridge.jpg", + "registration": "/data/registration.yaml", + "homeserver_url": "https://im.deuxfleurs.fr", + "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", + "matrix_domain": "deuxfleurs.fr", + "web_session_key": "{{ key "secrets/chat/easybridge/web_session_key" | trimSpace }}" +} diff --git a/consul/configuration/chat/easybridge/registration.yaml.tpl b/consul/configuration/chat/easybridge/registration.yaml.tpl new file mode 100644 index 0000000..0123bc3 --- /dev/null +++ b/consul/configuration/chat/easybridge/registration.yaml.tpl @@ -0,0 +1,14 @@ +id: Easybridge +url: http://easybridge.service.2.cluster.deuxfleurs.fr +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..87688a4 100644 --- a/consul/configuration/chat/synapse/homeserver.yaml +++ b/consul/configuration/chat/synapse/homeserver.yaml @@ -309,6 +309,7 @@ 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" # macaroon_secret_key: -- cgit v1.2.3 From f0a527ac7fc95bbe5102ddf709a5c4b95d03609c Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Fri, 28 Feb 2020 22:40:31 +0100 Subject: Fix configuration --- consul/configuration/chat/easybridge/registration.yaml.tpl | 2 +- consul/configuration/chat/synapse/homeserver.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'consul') diff --git a/consul/configuration/chat/easybridge/registration.yaml.tpl b/consul/configuration/chat/easybridge/registration.yaml.tpl index 0123bc3..006a968 100644 --- a/consul/configuration/chat/easybridge/registration.yaml.tpl +++ b/consul/configuration/chat/easybridge/registration.yaml.tpl @@ -1,5 +1,5 @@ id: Easybridge -url: http://easybridge.service.2.cluster.deuxfleurs.fr +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_ diff --git a/consul/configuration/chat/synapse/homeserver.yaml b/consul/configuration/chat/synapse/homeserver.yaml index 87688a4..0534235 100644 --- a/consul/configuration/chat/synapse/homeserver.yaml +++ b/consul/configuration/chat/synapse/homeserver.yaml @@ -308,8 +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: -- cgit v1.2.3 From e7a1a16884b774004fc2385b8c67cfa53699547b Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sat, 29 Feb 2020 15:24:39 +0100 Subject: Reconfigure so that user IDs are as prefixes and not suffixes --- consul/configuration/chat/easybridge/config.json.tpl | 16 ++++++++++------ .../configuration/chat/easybridge/registration.yaml.tpl | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'consul') diff --git a/consul/configuration/chat/easybridge/config.json.tpl b/consul/configuration/chat/easybridge/config.json.tpl index 39ac9ee..40ecc44 100644 --- a/consul/configuration/chat/easybridge/config.json.tpl +++ b/consul/configuration/chat/easybridge/config.json.tpl @@ -1,13 +1,17 @@ { - "log_level": "debug", - "appservice_bind_addr": "0.0.0.0:8321", + "log_level": "info", + "easybridge_avatar": "/app/easybridge.jpg", + "web_bind_addr": "0.0.0.0:8281", "web_url": "https://easybridge.deuxfleurs.fr", - "easybridge_avatar": "/app/easybridge.jpg", + "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", - "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", "matrix_domain": "deuxfleurs.fr", - "web_session_key": "{{ key "secrets/chat/easybridge/web_session_key" | trimSpace }}" + "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 index 006a968..ec098fd 100644 --- a/consul/configuration/chat/easybridge/registration.yaml.tpl +++ b/consul/configuration/chat/easybridge/registration.yaml.tpl @@ -7,8 +7,8 @@ rate_limited: false namespaces: users: - exclusive: true - regex: '@_ezbr_.*' + regex: '@.*_ezbr_' aliases: - exclusive: true - regex: '#_ezbr_.*' + regex: '#.*_ezbr_' rooms: [] -- cgit v1.2.3