aboutsummaryrefslogtreecommitdiff
path: root/consul
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2020-02-29 15:24:39 +0100
committerAlex Auvolat <alex@adnab.me>2020-02-29 15:24:39 +0100
commite7a1a16884b774004fc2385b8c67cfa53699547b (patch)
treec91bf634cf6ecc61960e3be7fff51b674d5ecedd /consul
parentf0a527ac7fc95bbe5102ddf709a5c4b95d03609c (diff)
downloadinfrastructure-e7a1a16884b774004fc2385b8c67cfa53699547b.tar.gz
infrastructure-e7a1a16884b774004fc2385b8c67cfa53699547b.zip
Reconfigure so that user IDs are as prefixes and not suffixes
Diffstat (limited to 'consul')
-rw-r--r--consul/configuration/chat/easybridge/config.json.tpl16
-rw-r--r--consul/configuration/chat/easybridge/registration.yaml.tpl4
2 files changed, 12 insertions, 8 deletions
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: []