aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--consul/configuration/chat/easybridge/config.json.tpl17
-rw-r--r--consul/configuration/chat/easybridge/registration.yaml.tpl14
-rw-r--r--consul/configuration/chat/synapse/homeserver.yaml3
-rw-r--r--nomad/chat.hcl103
4 files changed, 136 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>
diff --git a/nomad/chat.hcl b/nomad/chat.hcl
index 70bacbf..0b63eca 100644
--- a/nomad/chat.hcl
+++ b/nomad/chat.hcl
@@ -39,6 +39,16 @@ job "chat" {
}
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"
mode = "file"
@@ -178,6 +188,99 @@ job "chat" {
}
}
*/
+
+
+ group "easybridge" {
+ count = 1
+ task "easybridge" {
+ driver = "docker"
+ config {
+ image = "lxpz/easybridge_amd64:14"
+ port_map {
+ api_port = 8321
+ web_port = 8281
+ }
+ volumes = [
+ "secrets/conf:/data"
+ ]
+ args = [ "./easybridge", "-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 = 500
+ cpu = 1000
+ 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