Deuxfleurs/infrastructure
Archived
24
2
Fork 2
Code Issues 22 Pull requests Projects 1 Releases Wiki Activity

Merge branch 'easybridge'

Browse source
This commit is contained in:
Quentin 2020-03-04 11:43:33 +01:00
commit aeda90a8da
4 changed files with 136 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
consul/configuration/chat/easybridge/config.json.tpl Normal file
View file

@ -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"
}

14
consul/configuration/chat/easybridge/registration.yaml.tpl Normal file
View file

@ -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: []

3
consul/configuration/chat/synapse/homeserver.yaml
View file

@ -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>

103
nomad/chat.hcl
View file

@ -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,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