diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-12-08 23:48:08 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-12-08 23:48:08 +0100 |
| commit | 2d2e7bb5c665fe93fcbb8a980b5fa047b04b8ec0 (patch) | |
| tree | fc1d12a54ad6874b6454a6ed48d7c9a28e16035b | |
| parent | ea55c9b12b9540418586305204843a256a29fdf5 (diff) | |
| download | infrastructure-2d2e7bb5c665fe93fcbb8a980b5fa047b04b8ec0.tar.gz infrastructure-2d2e7bb5c665fe93fcbb8a980b5fa047b04b8ec0.zip | |
fix tricot
| -rw-r--r-- | app/frontend/deploy/frontend-tricot.hcl | 2 | ||||
| -rw-r--r-- | app/garage/deploy/garage.hcl | 2 | ||||
| -rw-r--r-- | app/im/deploy/im.hcl | 1 | ||||
| -rw-r--r-- | app/jitsi/deploy/jitsi.hcl | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/app/frontend/deploy/frontend-tricot.hcl b/app/frontend/deploy/frontend-tricot.hcl index 59b13c5..bd9d6d3 100644 --- a/app/frontend/deploy/frontend-tricot.hcl +++ b/app/frontend/deploy/frontend-tricot.hcl @@ -25,7 +25,7 @@ job "frontend" { driver = "docker" config { - image = "lxpz/amd64_tricot:9" + image = "lxpz/amd64_tricot:17" network_mode = "host" readonly_rootfs = true ports = [ "http_port", "https_port", "admin_port" ] diff --git a/app/garage/deploy/garage.hcl b/app/garage/deploy/garage.hcl index b4df01e..0e7b44e 100644 --- a/app/garage/deploy/garage.hcl +++ b/app/garage/deploy/garage.hcl @@ -99,7 +99,7 @@ job "garage" { service { tags = [ "garage-web", - "tricot * 1000", + "tricot * 1", ] port = 3902 address_mode = "driver" diff --git a/app/im/deploy/im.hcl b/app/im/deploy/im.hcl index 6be4e8c..4cbfad2 100644 --- a/app/im/deploy/im.hcl +++ b/app/im/deploy/im.hcl @@ -128,6 +128,7 @@ job "im" { "traefik.frontend.rule=Host:deuxfleurs.fr;PathPrefix:/_matrix", "traefik.frontend.priority=100", "tricot deuxfleurs.fr/_matrix 100", + "tricot deuxfleurs.fr:443/_matrix 100", ] } } diff --git a/app/jitsi/deploy/jitsi.hcl b/app/jitsi/deploy/jitsi.hcl index bf6cfe8..6e36916 100644 --- a/app/jitsi/deploy/jitsi.hcl +++ b/app/jitsi/deploy/jitsi.hcl @@ -145,7 +145,7 @@ EOF "traefik.frontend.entryPoints=https", "traefik.frontend.rule=Host:jitsi.deuxfleurs.fr;PathPrefix:/", "traefik.protocol=https", - "tricot jitsi.deuxfleurs.fr", + "tricot-https jitsi.deuxfleurs.fr", ] port = "https_port" address_mode = "host" |