1 files changed, 36 insertions, 37 deletions

diff --git a/cluster/prod/app/garage/deploy/garage.hcl b/cluster/prod/app/garage/deploy/garage.hcl
index b6ea7f6..aad5c9b 100644
--- a/cluster/prod/app/garage/deploy/garage.hcl
+++ b/cluster/prod/app/garage/deploy/garage.hcl
@@ -80,9 +80,9 @@ job "garage" {
       #### Configuration for service ports: admin port (internal use only)
 
       service {
+        name = "garage-admin"
         port = "admin"
         address_mode = "host"
-        name = "garage-admin"
         # Check that Garage is alive and answering TCP connections
         check {
           type = "tcp"
@@ -96,9 +96,10 @@ job "garage" {
         }
       }
 
-      #### Configuration for service ports: externally available ports (API, web)
+      #### Configuration for service ports: externally available ports (S3 API, K2V, web)
 
       service {
+        name = "garage-api"
         tags = [
           "garage_api",
           "tricot garage.deuxfleurs.fr",
@@ -107,7 +108,6 @@ job "garage" {
         ]
         port = "s3"
         address_mode = "host"
-        name = "garage-api"
         # Check 1: Garage is alive and answering TCP connections
         check {
           name = "garage-api-live"
@@ -132,6 +132,39 @@ job "garage" {
       }
 
       service {
+        name = "garage-k2v"
+        tags = [
+          "garage_k2v",
+          "tricot k2v.deuxfleurs.fr",
+          "tricot-site-lb",
+        ]
+        port = "k2v"
+        address_mode = "host"
+        # Check 1: Garage is alive and answering TCP connections
+        check {
+          name = "garage-k2v-live"
+          type = "tcp"
+          interval = "60s"
+          timeout = "5s"
+          check_restart {
+            limit = 3
+            grace = "90s"
+            ignore_warnings = false
+          }
+        }
+        # Check 2: Garage is in a healthy state and requests should be routed here
+        check {
+          name = "garage-k2v-healthy"
+          port = "admin"
+          type = "http"
+          path = "/health"
+          interval = "60s"
+          timeout = "5s"
+        }
+      }
+
+      service {
+        name = "garage-web"
         tags = [
             "garage-web",
             "tricot * 1",
@@ -144,7 +177,6 @@ job "garage" {
         ]
         port = "web"
         address_mode = "host"
-        name = "garage-web"
         # Check 1: Garage is alive and answering TCP connections
         check {
           name = "garage-web-live"
@@ -183,39 +215,6 @@ job "garage" {
         port = "web"
         on_update = "ignore"
       }
-          
-
-      service {
-        tags = [
-          "garage_k2v",
-          "tricot k2v.deuxfleurs.fr",
-          "tricot-site-lb",
-        ]
-        port = "k2v"
-        address_mode = "host"
-        name = "garage-k2v"
-        # Check 1: Garage is alive and answering TCP connections
-        check {
-          name = "garage-k2v-live"
-          type = "tcp"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = false
-          }
-        }
-        # Check 2: Garage is in a healthy state and requests should be routed here
-        check {
-          name = "garage-k2v-healthy"
-          port = "admin"
-          type = "http"
-          path = "/health"
-          interval = "60s"
-          timeout = "5s"
-        }
-      }
     }
   }
 }