From 7f08d5f3240bd8e93a9447ec814d7fbd474851b9 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 8 Dec 2021 12:42:48 +0100 Subject: [PATCH] Add tricot tags to everything --- app/bagage/deploy/bagage.hcl | 1 + app/directory/deploy/directory.hcl | 1 + app/drone-ci/deploy/drone.hcl | 1 + app/email/deploy/email.hcl | 7 +++++-- app/garage-staging/deploy/garage.hcl | 1 + app/garage/deploy/garage.hcl | 25 ++++++++++++++++++++++++- app/im/deploy/im.hcl | 12 +++++++++--- app/jitsi/deploy/jitsi.hcl | 3 ++- app/platoo/deploy/platoo.hcl | 3 ++- app/plume/deploy/plume.hcl | 1 + 10 files changed, 47 insertions(+), 8 deletions(-) diff --git a/app/bagage/deploy/bagage.hcl b/app/bagage/deploy/bagage.hcl index 6fdabbb..bbf3cd9 100644 --- a/app/bagage/deploy/bagage.hcl +++ b/app/bagage/deploy/bagage.hcl @@ -60,6 +60,7 @@ job "bagage" { "traefik.enable=true", "traefik.frontend.entryPoints=https,http", "traefik.frontend.rule=Host:bagage.deuxfleurs.fr", + "tricot bagage.deuxfleurs.fr", ] port = "web_port" address_mode = "host" diff --git a/app/directory/deploy/directory.hcl b/app/directory/deploy/directory.hcl index 995a74e..a40eb5f 100644 --- a/app/directory/deploy/directory.hcl +++ b/app/directory/deploy/directory.hcl @@ -93,6 +93,7 @@ job "directory" { "traefik.enable=true", "traefik.frontend.entryPoints=https,http", "traefik.frontend.rule=Host:guichet.deuxfleurs.fr", + "tricot guichet.deuxfleurs.fr", ] port = "web_port" address_mode = "host" diff --git a/app/drone-ci/deploy/drone.hcl b/app/drone-ci/deploy/drone.hcl index 3dea64a..c49ab93 100644 --- a/app/drone-ci/deploy/drone.hcl +++ b/app/drone-ci/deploy/drone.hcl @@ -59,6 +59,7 @@ EOH "traefik.enable=true", "traefik.frontend.entryPoints=https,http", "traefik.frontend.rule=Host:drone.deuxfleurs.fr", + "tricot drone.deuxfleurs.fr", ] port = "web_port" address_mode = "host" diff --git a/app/email/deploy/email.hcl b/app/email/deploy/email.hcl index 84e66b8..a6b4a4c 100644 --- a/app/email/deploy/email.hcl +++ b/app/email/deploy/email.hcl @@ -423,7 +423,8 @@ job "email" { "alps", "traefik.enable=true", "traefik.frontend.entryPoints=https,http", - "traefik.frontend.rule=Host:alps.deuxfleurs.fr" + "traefik.frontend.rule=Host:alps.deuxfleurs.fr", + "tricot alps.deuxfleurs.fr", ] check { type = "tcp" @@ -477,7 +478,9 @@ job "email" { "sogo", "traefik.enable=true", "traefik.frontend.entryPoints=https,http", - "traefik.frontend.rule=Host:www.sogo.deuxfleurs.fr,sogo.deuxfleurs.fr;PathPrefix:/" + "traefik.frontend.rule=Host:www.sogo.deuxfleurs.fr,sogo.deuxfleurs.fr;PathPrefix:/", + "tricot www.sogo.deuxfleurs.fr", + "tricot sogo.deuxfleurs.fr", ] check { type = "tcp" diff --git a/app/garage-staging/deploy/garage.hcl b/app/garage-staging/deploy/garage.hcl index c9a7b23..2a526c9 100644 --- a/app/garage-staging/deploy/garage.hcl +++ b/app/garage-staging/deploy/garage.hcl @@ -99,6 +99,7 @@ job "garage-staging" { "garage-staging-web", "tricot *.garage-staging-web.home.adnab.me", "tricot rust-docs", + "tricot-add-header Access-Control-Allow-Origin *", ] port = 3992 address_mode = "driver" diff --git a/app/garage/deploy/garage.hcl b/app/garage/deploy/garage.hcl index 329b0b6..b4df01e 100644 --- a/app/garage/deploy/garage.hcl +++ b/app/garage/deploy/garage.hcl @@ -57,7 +57,8 @@ job "garage" { "garage_api", "traefik.enable=true", "traefik.frontend.entryPoints=https,http", - "traefik.frontend.rule=Host:garage.deuxfleurs.fr" + "traefik.frontend.rule=Host:garage.deuxfleurs.fr", + "tricot garage.deuxfleurs.fr", ] port = 3900 address_mode = "driver" @@ -95,6 +96,28 @@ job "garage" { } } + service { + tags = [ + "garage-web", + "tricot * 1000", + ] + port = 3902 + address_mode = "driver" + name = "garage-web" + check { + type = "tcp" + port = 3902 + address_mode = "driver" + interval = "60s" + timeout = "5s" + check_restart { + limit = 3 + grace = "90s" + ignore_warnings = false + } + } + } + restart { interval = "30m" attempts = 10 diff --git a/app/im/deploy/im.hcl b/app/im/deploy/im.hcl index 53c3f2c..6be4e8c 100644 --- a/app/im/deploy/im.hcl +++ b/app/im/deploy/im.hcl @@ -99,7 +99,10 @@ job "im" { "traefik.frontend.entryPoints=https", "traefik.frontend.rule=Host:im.deuxfleurs.fr;PathPrefix:/_matrix,/_synapse", "traefik.frontend.headers.customResponseHeaders=Access-Control-Allow-Origin: *", - "traefik.frontend.priority=100" + "traefik.frontend.priority=100", + "tricot im.deuxfleurs.fr/_matrix 100", + "tricot im.deuxfleurs.fr/_synapse 100", + "tricot-add-header Access-Control-Allow-Origin *", ] check { type = "tcp" @@ -123,7 +126,8 @@ job "im" { "traefik.enable=true", "traefik.frontend.entryPoints=https", "traefik.frontend.rule=Host:deuxfleurs.fr;PathPrefix:/_matrix", - "traefik.frontend.priority=100" + "traefik.frontend.priority=100", + "tricot deuxfleurs.fr/_matrix 100", ] } } @@ -199,7 +203,9 @@ EOH "traefik.enable=true", "traefik.frontend.entryPoints=https", "traefik.frontend.rule=Host:im.deuxfleurs.fr,riot.deuxfleurs.fr;PathPrefix:/", - "traefik.frontend.priority=10" + "traefik.frontend.priority=10", + "tricot im.deuxfleurs.fr 10", + "tricot riot.deuxfleurs.fr 10", ] port = "web_port" address_mode = "host" diff --git a/app/jitsi/deploy/jitsi.hcl b/app/jitsi/deploy/jitsi.hcl index a06cf73..bf6cfe8 100644 --- a/app/jitsi/deploy/jitsi.hcl +++ b/app/jitsi/deploy/jitsi.hcl @@ -144,7 +144,8 @@ EOF "traefik.enable=true", "traefik.frontend.entryPoints=https", "traefik.frontend.rule=Host:jitsi.deuxfleurs.fr;PathPrefix:/", - "traefik.protocol=https" + "traefik.protocol=https", + "tricot jitsi.deuxfleurs.fr", ] port = "https_port" address_mode = "host" diff --git a/app/platoo/deploy/platoo.hcl b/app/platoo/deploy/platoo.hcl index ffdda9e..d55e67e 100644 --- a/app/platoo/deploy/platoo.hcl +++ b/app/platoo/deploy/platoo.hcl @@ -41,7 +41,8 @@ EOH "platoo", "traefik.enable=true", "traefik.frontend.entryPoints=https", - "traefik.frontend.rule=Host:platoo.deuxfleurs.fr;PathPrefix:/" + "traefik.frontend.rule=Host:platoo.deuxfleurs.fr;PathPrefix:/", + "tricot platoo.deuxfleurs.fr", ] port = "web_port" address_mode = "host" diff --git a/app/plume/deploy/plume.hcl b/app/plume/deploy/plume.hcl index 7608a74..e89348f 100644 --- a/app/plume/deploy/plume.hcl +++ b/app/plume/deploy/plume.hcl @@ -46,6 +46,7 @@ job "plume" { "traefik.enable=true", "traefik.frontend.entryPoints=https,http", "traefik.frontend.rule=Host:plume.deuxfleurs.fr", + "tricot plume.deuxfleurs.fr", ] port = "web_port" address_mode = "host"