From e7a1a16884b774004fc2385b8c67cfa53699547b Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Sat, 29 Feb 2020 15:24:39 +0100
Subject: [PATCH] Reconfigure so that user IDs are as prefixes and not suffixes

---
 .../chat/easybridge/config.json.tpl              | 16 ++++++++++------
 .../chat/easybridge/registration.yaml.tpl        |  4 ++--
 nomad/chat.hcl                                   |  2 +-
 3 files changed, 13 insertions(+), 9 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: []
diff --git a/nomad/chat.hcl b/nomad/chat.hcl
index ddbb825..c2defd7 100644
--- a/nomad/chat.hcl
+++ b/nomad/chat.hcl
@@ -195,7 +195,7 @@ job "chat" {
     task "easybridge" {
       driver = "docker"
       config {
-        image = "lxpz/easybridge_amd64:8"
+        image = "lxpz/easybridge_amd64:9"
         port_map {
           api_port = 8321
           web_port = 8281