From 72f5c70096abb731ac081ce59fbc133b9f5dae27 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 1 Jun 2022 14:25:45 +0200
Subject: [PATCH] Move domains of some things to staging.deuxfleurs.org

---
 app/garage-staging/config/garage.toml | 2 +-
 app/garage-staging/deploy/garage.hcl  | 8 +++++---
 app/telemetry/deploy/telemetry.hcl    | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/garage-staging/config/garage.toml b/app/garage-staging/config/garage.toml
index 2008827..b4bc0d3 100644
--- a/app/garage-staging/config/garage.toml
+++ b/app/garage-staging/config/garage.toml
@@ -22,7 +22,7 @@ api_bind_addr = "0.0.0.0:3993"
 
 [s3_web]
 bind_addr = "0.0.0.0:3992"
-root_domain = ".garage-staging-web.home.adnab.me"
+root_domain = ".web.staging.deuxfleurs.org"
 index = "index.html"
 
 [admin]
diff --git a/app/garage-staging/deploy/garage.hcl b/app/garage-staging/deploy/garage.hcl
index b97fd1d..69c63c5 100644
--- a/app/garage-staging/deploy/garage.hcl
+++ b/app/garage-staging/deploy/garage.hcl
@@ -11,6 +11,10 @@ job "garage-staging" {
   }
 
   group "garage-staging" {
+    migrage {
+      max_parallel = 1
+    }
+
     network {
       port "s3" { static = 3990 }
       port "rpc" { static = 3991 }
@@ -80,7 +84,7 @@ job "garage-staging" {
       service {
         tags = [
           "garage-staging-k2v-api",
-          "tricot k2v-staging.home.adnab.me",
+          "tricot k2v.staging.deuxfleurs.org",
           "tricot-add-header Access-Control-Allow-Origin *",
         ]
         port = 3993
@@ -122,11 +126,9 @@ job "garage-staging" {
       service {
         tags = [
             "garage-staging-web",
-            "tricot *.garage-staging-web.home.adnab.me",
             "tricot *.web.staging.deuxfleurs.org",
             "tricot staging.deuxfleurs.org",
             "tricot matrix.home.adnab.me/.well-known/matrix/server",
-            "tricot rust-docs",
             "tricot-add-header Access-Control-Allow-Origin *",
         ]
         port = 3992
diff --git a/app/telemetry/deploy/telemetry.hcl b/app/telemetry/deploy/telemetry.hcl
index afabfa7..21685a1 100644
--- a/app/telemetry/deploy/telemetry.hcl
+++ b/app/telemetry/deploy/telemetry.hcl
@@ -39,7 +39,7 @@ EOH
       service {
         tags = [
             "kibana",
-            "tricot kibana.home.adnab.me",
+            "tricot kibana.staging.deuxfleurs.org",
         ]
         port = 5601
         address_mode = "driver"
@@ -133,7 +133,7 @@ EOH
       service {
         tags = [
             "grafana",
-            "tricot grafana.home.adnab.me",
+            "tricot grafana.staging.deuxfleurs.org",
         ]
         port = 3333
         address_mode = "driver"