diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-05-09 12:20:35 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-05-09 12:20:35 +0200 |
| commit | 24cf7ddd91e4b726d2ed276787947e104e26b53b (patch) | |
| tree | aeeec287fa80593ec83f0022d246a7defbf72c92 /cluster/prod/app/matrix | |
| parent | 6c07a429781d4a26a546e3f3049b41e0b968b033 (diff) | |
| parent | 24192cc61a982402e201d6dde4fa5ac2994e025f (diff) | |
| download | nixcfg-24cf7ddd91e4b726d2ed276787947e104e26b53b.tar.gz nixcfg-24cf7ddd91e4b726d2ed276787947e104e26b53b.zip | |
Merge branch 'main' into simplify-network-config
Diffstat (limited to 'cluster/prod/app/matrix')
| -rw-r--r-- | cluster/prod/app/matrix/config/synapse/homeserver.yaml | 2 | ||||
| -rw-r--r-- | cluster/prod/app/matrix/deploy/im.hcl | 18 |
2 files changed, 7 insertions, 13 deletions
diff --git a/cluster/prod/app/matrix/config/synapse/homeserver.yaml b/cluster/prod/app/matrix/config/synapse/homeserver.yaml index aac8709..ecdf1cd 100644 --- a/cluster/prod/app/matrix/config/synapse/homeserver.yaml +++ b/cluster/prod/app/matrix/config/synapse/homeserver.yaml @@ -61,7 +61,7 @@ database: user: {{ key "secrets/chat/synapse/postgres_user" | trimSpace }} password: {{ key "secrets/chat/synapse/postgres_pwd" | trimSpace }} database: {{ key "secrets/chat/synapse/postgres_db" | trimSpace }} - host: psql-proxy.service.prod.consul + host: {{ env "meta.site" }}.psql-proxy.service.prod.consul port: 5432 cp_min: 5 cp_max: 10 diff --git a/cluster/prod/app/matrix/deploy/im.hcl b/cluster/prod/app/matrix/deploy/im.hcl index ed05ffc..324c3d9 100644 --- a/cluster/prod/app/matrix/deploy/im.hcl +++ b/cluster/prod/app/matrix/deploy/im.hcl @@ -1,5 +1,5 @@ job "matrix" { - datacenters = ["orion"] + datacenters = ["orion", "neptune"] type = "service" priority = 40 @@ -8,6 +8,7 @@ job "matrix" { network { port "api_port" { static = 8008 } + port "web_port" { to = 8043 } } task "synapse" { @@ -79,6 +80,7 @@ job "matrix" { "tricot im.deuxfleurs.fr:443/_matrix 100", "tricot im.deuxfleurs.fr/_synapse 100", "tricot-add-header Access-Control-Allow-Origin *", + "d53-cname im.deuxfleurs.fr", ] check { type = "tcp" @@ -123,24 +125,15 @@ 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=psql-proxy.service.2.cluster.deuxfleurs.fr +PG_HOST={{ env "meta.site" }}.psql-proxy.service.2.cluster.deuxfleurs.fr PG_PORT=5432 EOH destination = "secrets/env" env = true } } - } - - - group "riotweb" { - count = 1 - - network { - port "web_port" { to = 8043 } - } - task "server" { + task "riotweb" { driver = "docker" config { image = "superboum/amd64_riotweb:v33" @@ -164,6 +157,7 @@ EOH "webstatic", "tricot im.deuxfleurs.fr 10", "tricot riot.deuxfleurs.fr 10", + "d53-cname riot.deuxfleurs.fr", ] port = "web_port" address_mode = "host" |