aboutsummaryrefslogtreecommitdiff
path: root/cluster/prod/app/matrix/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'cluster/prod/app/matrix/deploy')
-rw-r--r--cluster/prod/app/matrix/deploy/im.hcl18
1 files changed, 6 insertions, 12 deletions
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"