deploy new matrix version
This commit is contained in:
parent
cab3425d34
commit
2a763ffee8
1 changed files with 4 additions and 69 deletions
|
@ -15,7 +15,7 @@ job "matrix" {
|
|||
driver = "docker"
|
||||
|
||||
config {
|
||||
image = "particallydone/amd64_synapse:v60"
|
||||
image = "superboum/amd64_synapse:v61"
|
||||
network_mode = "host"
|
||||
readonly_rootfs = true
|
||||
ports = [ "api_port" ]
|
||||
|
@ -101,7 +101,7 @@ job "matrix" {
|
|||
driver = "docker"
|
||||
|
||||
config {
|
||||
image = "particallydone/amd64_synapse:v60"
|
||||
image = "superboum/amd64_synapse:v61"
|
||||
readonly_rootfs = true
|
||||
command = "/usr/local/bin/matrix-s3-async"
|
||||
work_dir = "/tmp"
|
||||
|
@ -126,7 +126,7 @@ AWS_DEFAULT_REGION=garage
|
|||
PG_USER={{ key "secrets/chat/synapse/postgres_user" | trimSpace }}
|
||||
PG_PASS={{ key "secrets/chat/synapse/postgres_pwd" | trimSpace }}
|
||||
PG_DB={{ key "secrets/chat/synapse/postgres_db" | trimSpace }}
|
||||
PG_HOST={{ env "meta.site" }}.psql-proxy.service.2.cluster.deuxfleurs.fr
|
||||
PG_HOST={{ env "meta.site" }}.psql-proxy.service.prod.consul
|
||||
PG_PORT=5432
|
||||
EOH
|
||||
destination = "secrets/env"
|
||||
|
@ -137,7 +137,7 @@ EOH
|
|||
task "riotweb" {
|
||||
driver = "docker"
|
||||
config {
|
||||
image = "particallydone/amd64_elementweb:v36"
|
||||
image = "superboum/amd64_elementweb:v37"
|
||||
ports = [ "web_port" ]
|
||||
volumes = [
|
||||
"secrets/config.json:/srv/http/config.json"
|
||||
|
@ -177,70 +177,5 @@ EOH
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
group "syncv3" {
|
||||
count = 1
|
||||
|
||||
network {
|
||||
port "syncv3_api" { to = 8009 }
|
||||
port "syncv3_metrics" { to = 2112 }
|
||||
}
|
||||
|
||||
task "syncv3" {
|
||||
driver = "docker"
|
||||
|
||||
config {
|
||||
image = "ghcr.io/matrix-org/sliding-sync:v0.99.16"
|
||||
ports = [ "syncv3_api", "syncv3_metrics" ]
|
||||
}
|
||||
|
||||
resources {
|
||||
cpu = 1000
|
||||
memory = 500
|
||||
memory_max = 1000
|
||||
}
|
||||
|
||||
template {
|
||||
data = <<EOH
|
||||
SYNCV3_SERVER=http://synapse.service.prod.consul:8008
|
||||
SYNCV3_DB=postgresql://{{ key "secrets/chat/syncv3/postgres_user"|trimSpace }}:{{ key "secrets/chat/syncv3/postgres_pwd"|trimSpace }}@{{ env "meta.site" }}.psql-proxy.service.prod.consul/{{ key "secrets/chat/syncv3/postgres_db"|trimSpace }}?sslmode=disable
|
||||
SYNCV3_SECRET={{ key "secrets/chat/syncv3/secret"|trimSpace }}
|
||||
SYNCV3_BINDADDR=0.0.0.0:8009
|
||||
SYNCV3_PROM=0.0.0.0:2112
|
||||
EOH
|
||||
destination = "secrets/env"
|
||||
env = true
|
||||
}
|
||||
|
||||
service {
|
||||
name = "matrix-syncv3"
|
||||
port = "syncv3_api"
|
||||
address_mode = "host"
|
||||
tags = [
|
||||
"matrix",
|
||||
"tricot im-syncv3.deuxfleurs.fr 100",
|
||||
"tricot-add-header Access-Control-Allow-Origin *",
|
||||
"d53-cname im-syncv3.deuxfleurs.fr",
|
||||
]
|
||||
check {
|
||||
type = "tcp"
|
||||
port = "syncv3_api"
|
||||
interval = "60s"
|
||||
timeout = "5s"
|
||||
check_restart {
|
||||
limit = 3
|
||||
grace = "90s"
|
||||
ignore_warnings = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
service {
|
||||
name = "matrix-syncv3-metrics"
|
||||
port = "syncv3_metrics"
|
||||
address_mode = "host"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue