From 85130033883bd9ceb61b2b1d7a9b085b273c7d8d Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 14 Dec 2022 17:52:13 +0100
Subject: staging: garage update

---
 cluster/staging/app/garage/deploy/garage-nix2.hcl | 175 ----------------------
 cluster/staging/app/garage/deploy/garage.hcl      | 175 ++++++++++++++++++++++
 2 files changed, 175 insertions(+), 175 deletions(-)
 delete mode 100644 cluster/staging/app/garage/deploy/garage-nix2.hcl
 create mode 100644 cluster/staging/app/garage/deploy/garage.hcl

diff --git a/cluster/staging/app/garage/deploy/garage-nix2.hcl b/cluster/staging/app/garage/deploy/garage-nix2.hcl
deleted file mode 100644
index b67f682..0000000
--- a/cluster/staging/app/garage/deploy/garage-nix2.hcl
+++ /dev/null
@@ -1,175 +0,0 @@
-job "garage-staging" {
-  type = "system"
-  priority = 90
-
-  datacenters = [ "neptune", "jupiter" ]
-
-  update {
-    max_parallel = 1
-    stagger = "30s"
-    min_healthy_time = "10s"
-  }
-
-  group "garage-staging" {
-    network {
-      port "s3" { static = 3990 }
-      port "rpc" { static = 3991 }
-      port "web" { static = 3992 }
-      port "k2v" { static = 3993 }
-      port "admin" { static = 3909 }
-    }
-
-    task "server" {
-      driver = "nix2"
-
-      config {
-        packages = [
-          "#bash", # so that we can enter a shell inside container
-          "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?ref=admin-health-api&rev=d7868c48a4d8d5831051a0be088fe7bbec259bca",
-        ]
-        command = "garage"
-        args = [ "server" ]
-        bind = {
-          "/mnt/storage/garage-staging/data" = "/data",
-          "/mnt/ssd/garage-staging/meta" = "/meta",
-        }
-      }
-
-      env = {
-        RUST_LOG = "garage=debug",
-      }
-
-      # files currently owned by root, we don't want to chown everything
-      user = "root"
-
-      template {
-        data = file("../config/garage.toml")
-        destination = "etc/garage.toml"
-      }
-
-      template {
-        data = "{{ key \"secrets/consul/consul-ca.crt\" }}"
-        destination = "etc/garage/consul-ca.crt"
-      }
-
-      template {
-        data = "{{ key \"secrets/consul/consul-client.crt\" }}"
-        destination = "etc/garage/consul-client.crt"
-      }
-
-      template {
-        data = "{{ key \"secrets/consul/consul-client.key\" }}"
-        destination = "etc/garage/consul-client.key"
-      }
-
-      resources {
-        memory = 2000
-        memory_max = 3000
-        cpu = 500
-      }
-
-      kill_signal = "SIGINT"
-      kill_timeout = "20s"
-
-      service {
-        name = "garage-staging-rpc"
-        tags = ["garage-staging-rpc"]
-        port = "rpc"
-      }
-
-      service {
-        name = "garage-staging-s3-api"
-        tags = [
-          "garage-staging-api",
-          "tricot garage.staging.deuxfleurs.org",
-          "tricot-add-header Access-Control-Allow-Origin *",
-          "tricot-site-lb",
-        ]
-        port = "s3"
-        check {
-          port = "admin"
-          type = "http"
-          path = "/health"
-          interval = "60s"
-          timeout = "5s"
-        }
-      }
-
-      service {
-        name = "garage-staging-k2v-api"
-        tags = [
-          "garage-staging-k2v-api",
-          "tricot k2v.staging.deuxfleurs.org",
-          "tricot-add-header Access-Control-Allow-Origin *",
-          "tricot-site-lb",
-        ]
-        port = "k2v"
-        check {
-          port = "admin"
-          type = "http"
-          path = "/health"
-          interval = "60s"
-          timeout = "5s"
-        }
-      }
-
-      service {
-        name = "garage-staging-web"
-        tags = [
-            "garage-staging-web",
-            "tricot *.web.staging.deuxfleurs.org",
-            "tricot staging.deuxfleurs.org",
-            "tricot matrix.home.adnab.me/.well-known/matrix/server",
-            "tricot-add-header Access-Control-Allow-Origin *",
-            "tricot-site-lb",
-        ]
-        port = "web"
-        check {
-          port = "admin"
-          type = "http"
-          path = "/health"
-          interval = "60s"
-          timeout = "5s"
-        }
-      }
-
-      service {
-        name = "garage-staging-admin"
-        tags = [
-          "garage-staging-admin",
-        ]
-        port = "admin"
-        check {
-          name = "garage-admin-health-check"
-          type = "http"
-          path = "/health"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 10
-            grace = "90s"
-            ignore_warnings = true
-          }
-        }
-        check {
-          name = "garage-tcp-liveness-check"
-          type = "tcp"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = true
-          }
-        }
-      }
-
-      restart {
-        interval = "5m"
-        attempts = 10
-        delay    = "1m"
-        mode     = "delay"
-      }
-    }
-  }
-}
diff --git a/cluster/staging/app/garage/deploy/garage.hcl b/cluster/staging/app/garage/deploy/garage.hcl
new file mode 100644
index 0000000..03a62cb
--- /dev/null
+++ b/cluster/staging/app/garage/deploy/garage.hcl
@@ -0,0 +1,175 @@
+job "garage-staging" {
+  type = "system"
+  priority = 90
+
+  datacenters = [ "neptune", "jupiter" ]
+
+  update {
+    max_parallel = 1
+    stagger = "1m"
+    min_healthy_time = "10s"
+  }
+
+  group "garage-staging" {
+    network {
+      port "s3" { static = 3990 }
+      port "rpc" { static = 3991 }
+      port "web" { static = 3992 }
+      port "k2v" { static = 3993 }
+      port "admin" { static = 3909 }
+    }
+
+    task "server" {
+      driver = "nix2"
+
+      config {
+        packages = [
+          "#bash", # so that we can enter a shell inside container
+          "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?ref=cli-improvements&rev=041b60ed1dc48563ad297a6a30230655555c9a20",
+        ]
+        command = "garage"
+        args = [ "server" ]
+        bind = {
+          "/mnt/storage/garage-staging/data" = "/data",
+          "/mnt/ssd/garage-staging/meta" = "/meta",
+        }
+      }
+
+      env = {
+        RUST_LOG = "garage=debug",
+      }
+
+      # files currently owned by root, we don't want to chown everything
+      user = "root"
+
+      template {
+        data = file("../config/garage.toml")
+        destination = "etc/garage.toml"
+      }
+
+      template {
+        data = "{{ key \"secrets/consul/consul-ca.crt\" }}"
+        destination = "etc/garage/consul-ca.crt"
+      }
+
+      template {
+        data = "{{ key \"secrets/consul/consul-client.crt\" }}"
+        destination = "etc/garage/consul-client.crt"
+      }
+
+      template {
+        data = "{{ key \"secrets/consul/consul-client.key\" }}"
+        destination = "etc/garage/consul-client.key"
+      }
+
+      resources {
+        memory = 2000
+        memory_max = 3000
+        cpu = 500
+      }
+
+      kill_signal = "SIGINT"
+      kill_timeout = "20s"
+
+      service {
+        name = "garage-staging-rpc"
+        tags = ["garage-staging-rpc"]
+        port = "rpc"
+      }
+
+      service {
+        name = "garage-staging-s3-api"
+        tags = [
+          "garage-staging-api",
+          "tricot garage.staging.deuxfleurs.org",
+          "tricot-add-header Access-Control-Allow-Origin *",
+          "tricot-site-lb",
+        ]
+        port = "s3"
+        check {
+          port = "admin"
+          type = "http"
+          path = "/health"
+          interval = "60s"
+          timeout = "5s"
+        }
+      }
+
+      service {
+        name = "garage-staging-k2v-api"
+        tags = [
+          "garage-staging-k2v-api",
+          "tricot k2v.staging.deuxfleurs.org",
+          "tricot-add-header Access-Control-Allow-Origin *",
+          "tricot-site-lb",
+        ]
+        port = "k2v"
+        check {
+          port = "admin"
+          type = "http"
+          path = "/health"
+          interval = "60s"
+          timeout = "5s"
+        }
+      }
+
+      service {
+        name = "garage-staging-web"
+        tags = [
+            "garage-staging-web",
+            "tricot *.web.staging.deuxfleurs.org",
+            "tricot staging.deuxfleurs.org",
+            "tricot matrix.home.adnab.me/.well-known/matrix/server",
+            "tricot-add-header Access-Control-Allow-Origin *",
+            "tricot-site-lb",
+        ]
+        port = "web"
+        check {
+          port = "admin"
+          type = "http"
+          path = "/health"
+          interval = "60s"
+          timeout = "5s"
+        }
+      }
+
+      service {
+        name = "garage-staging-admin"
+        tags = [
+          "garage-staging-admin",
+        ]
+        port = "admin"
+        check {
+          name = "garage-admin-health-check"
+          type = "http"
+          path = "/health"
+          interval = "60s"
+          timeout = "5s"
+          check_restart {
+            limit = 10
+            grace = "90s"
+            ignore_warnings = true
+          }
+        }
+        check {
+          name = "garage-tcp-liveness-check"
+          type = "tcp"
+          interval = "60s"
+          timeout = "5s"
+          check_restart {
+            limit = 3
+            grace = "90s"
+            ignore_warnings = true
+          }
+        }
+      }
+
+      restart {
+        interval = "5m"
+        attempts = 10
+        delay    = "1m"
+        mode     = "delay"
+      }
+    }
+  }
+}
-- 
cgit v1.2.3