diff --git a/cluster/prod/app/core/deploy/tricot.hcl b/cluster/prod/app/core/deploy/tricot.hcl index f54657f..d8d4745 100644 --- a/cluster/prod/app/core/deploy/tricot.hcl +++ b/cluster/prod/app/core/deploy/tricot.hcl @@ -1,9 +1,5 @@ job "core-tricot" { - # bespin pas pour l'instant, on a des soucis de SSL avec gitea - # on pourra mettre bespin quand on aura migré gitea de la vm vers le cluster - # en attendant, les deux ne sont pas capables de partager les certificats SSL - # donc on laisse la VM gitea gérer les certifs et prendre tout le trafic http(s) - datacenters = ["corrin", "neptune", "scorpio"] + datacenters = ["corrin", "bespin", "scorpio"] type = "system" priority = 90 @@ -43,7 +39,6 @@ job "core-tricot" { resources { cpu = 1000 memory = 200 - memory_max = 500 } restart { diff --git a/cluster/prod/app/garage/deploy/garage.hcl b/cluster/prod/app/garage/deploy/garage.hcl index ca2481b..2832acf 100644 --- a/cluster/prod/app/garage/deploy/garage.hcl +++ b/cluster/prod/app/garage/deploy/garage.hcl @@ -169,7 +169,6 @@ job "garage" { "garage-web", "tricot * 1", "tricot-add-header Strict-Transport-Security max-age=63072000; includeSubDomains; preload", - "tricot-add-header X-Frame-Options SAMEORIGIN", "tricot-add-header X-XSS-Protection 1; mode=block", "tricot-add-header X-Content-Type-Options nosniff", "tricot-on-demand-tls-ask http://garage-admin.service.prod.consul:3903/check",