From fbffe1f0dc9bdc8ac4af50def9a6401a25bbad99 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 5 Oct 2023 18:51:13 +0200
Subject: [PATCH] staging: update guichet with website management

---
 cluster/staging/app/directory/config/guichet/config.json.tpl | 3 +++
 cluster/staging/app/directory/deploy/directory.hcl           | 2 +-
 cluster/staging/app/garage/deploy/garage.hcl                 | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cluster/staging/app/directory/config/guichet/config.json.tpl b/cluster/staging/app/directory/config/guichet/config.json.tpl
index 1a843a8..cf01558 100644
--- a/cluster/staging/app/directory/config/guichet/config.json.tpl
+++ b/cluster/staging/app/directory/config/guichet/config.json.tpl
@@ -25,6 +25,9 @@
   "group_can_admin": "cn=admin,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}",
   "group_can_invite": "cn=asso_deuxfleurs,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}",
 
+  "s3_admin_endpoint": "garage-staging-admin.service.staging.consul:3909",
+  "s3_admin_token": "{{ key "secrets/garage-staging/admin_token" | trimSpace }}",
+
   "s3_endpoint": "{{ key "secrets/directory/guichet/s3_endpoint" }}",
   "s3_access_key": "{{ key "secrets/directory/guichet/s3_access_key" | trimSpace }}",
   "s3_secret_key": "{{ key "secrets/directory/guichet/s3_secret_key" | trimSpace }}",
diff --git a/cluster/staging/app/directory/deploy/directory.hcl b/cluster/staging/app/directory/deploy/directory.hcl
index c88d47e..534bf02 100644
--- a/cluster/staging/app/directory/deploy/directory.hcl
+++ b/cluster/staging/app/directory/deploy/directory.hcl
@@ -93,7 +93,7 @@ EOH
       driver = "nix2"
       config {
         packages = [
-          "git+https://git.deuxfleurs.fr/Deuxfleurs/guichet.git?ref=main&rev=085a7cfd26c553adfc3ca9d9dd3e043753b0d3ea"
+          "git+https://git.deuxfleurs.fr/Deuxfleurs/guichet.git?ref=main&rev=10bdee10cf6947ec6dd0ba5040d7274d6c3316a7"
         ]
         command = "guichet"
       }
diff --git a/cluster/staging/app/garage/deploy/garage.hcl b/cluster/staging/app/garage/deploy/garage.hcl
index 82dce14..4149a87 100644
--- a/cluster/staging/app/garage/deploy/garage.hcl
+++ b/cluster/staging/app/garage/deploy/garage.hcl
@@ -27,7 +27,7 @@ job "garage-staging" {
           "#bash", # so that we can enter a shell inside container
           "#coreutils",
 		  # garage v0.9.0-rc1
-         "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?ref=next&rev=2e656b541b1dd1492798e1ed764fa40868da4d6a",
+         "git+https://git.deuxfleurs.fr/Deuxfleurs/garage.git?ref=next&rev=0c431b0c035f4de8ea9d1d9bd0b419bfc74ceabf",
         ]
         command = "garage"
         args = [ "server" ]