From 155a9f7e4d96072c9a9afe35433b16156d5ddcb9 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Fri, 28 Feb 2020 20:08:37 +0100 Subject: [PATCH 1/4] Initial Easybridge setup --- .../chat/easybridge/config.json.tpl | 13 +++ .../chat/easybridge/registration.yaml.tpl | 14 +++ .../chat/synapse/homeserver.yaml | 1 + nomad/chat.hcl | 102 ++++++++++++++++++ 4 files changed, 130 insertions(+) create mode 100644 consul/configuration/chat/easybridge/config.json.tpl create mode 100644 consul/configuration/chat/easybridge/registration.yaml.tpl 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: diff --git a/nomad/chat.hcl b/nomad/chat.hcl index 70bacbf..83cc141 100644 --- a/nomad/chat.hcl +++ b/nomad/chat.hcl @@ -38,6 +38,16 @@ job "chat" { destination = "secrets/conf/homeserver.yaml" } + artifact { + source = "http://127.0.0.1:8500/v1/kv/configuration/chat/easybridge/registration.yaml.tpl?raw" + destination = "secrets/tpl/easybridge_registration.yaml.tpl" + mode = "file" + } + template { + source = "secrets/tpl/easybridge_registration.yaml.tpl" + destination = "secrets/conf/easybridge_registration.yaml" + } + artifact { source = "http://127.0.0.1:8500/v1/kv/configuration/chat/fb2mx/registration.yaml?raw" destination = "secrets/tpl/fb2mx_registration.yaml.tpl" @@ -178,6 +188,98 @@ job "chat" { } } */ + + + group "easybridge" { + count = 1 + task "easybridge" { + driver = "docker" + config { + image = "lxpz/easybridge_amd64:5" + port_map { + api_port = 8321 + web_port = 8281 + } + volumes = [ + "secrets/conf:/data" + ] + args = [ "-config", "/data/config.json" ] + } + + artifact { + source = "http://127.0.0.1:8500/v1/kv/configuration/chat/easybridge/registration.yaml.tpl?raw" + destination = "secrets/tpl/registration.yaml.tpl" + mode = "file" + } + template { + source = "secrets/tpl/registration.yaml.tpl" + destination = "secrets/conf/registration.yaml" + } + + artifact { + source = "http://127.0.0.1:8500/v1/kv/configuration/chat/easybridge/config.json.tpl?raw" + destination = "secrets/tpl/config.json.tpl" + mode = "file" + } + template { + source = "secrets/tpl/config.json.tpl" + destination = "secrets/conf/config.json" + } + + resources { + memory = 50 + network { + port "api_port" { + static = "8321" + } + port "web_port" {} + } + } + + service { + name = "easybridge-api" + tags = ["easybridge-api"] + port = "api_port" + address_mode = "host" + check { + type = "tcp" + port = "api_port" + interval = "60s" + timeout = "5s" + check_restart { + limit = 3 + grace = "90s" + ignore_warnings = false + } + } + } + + service { + name = "easybridge-web" + tags = [ + "easybridge-web", + "traefik.enable=true", + "traefik.frontend.entryPoints=https,http", + "traefik.frontend.rule=Host:easybridge.deuxfleurs.fr", + ] + port = "web_port" + address_mode = "host" + check { + type = "tcp" + port = "web_port" + interval = "60s" + timeout = "5s" + check_restart { + limit = 3 + grace = "90s" + ignore_warnings = false + } + } + } + } + } + + group "riotweb" { count = 1 From f0a527ac7fc95bbe5102ddf709a5c4b95d03609c Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Fri, 28 Feb 2020 22:40:31 +0100 Subject: [PATCH 2/4] Fix configuration --- consul/configuration/chat/easybridge/registration.yaml.tpl | 2 +- consul/configuration/chat/synapse/homeserver.yaml | 2 +- nomad/chat.hcl | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) 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: diff --git a/nomad/chat.hcl b/nomad/chat.hcl index 83cc141..ddbb825 100644 --- a/nomad/chat.hcl +++ b/nomad/chat.hcl @@ -195,7 +195,7 @@ job "chat" { task "easybridge" { driver = "docker" config { - image = "lxpz/easybridge_amd64:5" + image = "lxpz/easybridge_amd64:8" port_map { api_port = 8321 web_port = 8281 @@ -227,7 +227,8 @@ job "chat" { } resources { - memory = 50 + memory = 500 + cpu = 1000 network { port "api_port" { static = "8321" From e7a1a16884b774004fc2385b8c67cfa53699547b Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Sat, 29 Feb 2020 15:24:39 +0100 Subject: [PATCH 3/4] 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 From 1667c4c5ce4aeec06530e4179e198d8650c5d92a Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 2 Mar 2020 21:56:45 +0100 Subject: [PATCH 4/4] Update easybridge --- nomad/chat.hcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nomad/chat.hcl b/nomad/chat.hcl index c2defd7..0b63eca 100644 --- a/nomad/chat.hcl +++ b/nomad/chat.hcl @@ -195,7 +195,7 @@ job "chat" { task "easybridge" { driver = "docker" config { - image = "lxpz/easybridge_amd64:9" + image = "lxpz/easybridge_amd64:14" port_map { api_port = 8321 web_port = 8281 @@ -203,7 +203,7 @@ job "chat" { volumes = [ "secrets/conf:/data" ] - args = [ "-config", "/data/config.json" ] + args = [ "./easybridge", "-config", "/data/config.json" ] } artifact {