From b8470be123c7e6e72038223ecc6b931893c5e421 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Mon, 16 Aug 2021 16:45:04 +0200
Subject: [PATCH] Update guichet

---
 app/directory/config/guichet/config.json.tpl          | 8 +++++++-
 app/directory/deploy/directory.hcl                    | 2 +-
 app/directory/secrets/directory/guichet/s3_access_key | 1 +
 app/directory/secrets/directory/guichet/s3_secret_key | 1 +
 app/directory/secrets/directory/guichet/smtp_pass     | 1 +
 app/directory/secrets/directory/guichet/smtp_user     | 1 +
 6 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 app/directory/secrets/directory/guichet/s3_access_key
 create mode 100644 app/directory/secrets/directory/guichet/s3_secret_key
 create mode 100644 app/directory/secrets/directory/guichet/smtp_pass
 create mode 100644 app/directory/secrets/directory/guichet/smtp_user

diff --git a/app/directory/config/guichet/config.json.tpl b/app/directory/config/guichet/config.json.tpl
index c34cf7f..2ee301a 100644
--- a/app/directory/config/guichet/config.json.tpl
+++ b/app/directory/config/guichet/config.json.tpl
@@ -25,6 +25,12 @@
 
   "admin_account": "cn=admin,dc=deuxfleurs,dc=fr",
   "group_can_admin": "cn=admin,ou=groups,dc=deuxfleurs,dc=fr",
-  "group_can_invite": "cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr"
+  "group_can_invite": "cn=asso_deuxfleurs,ou=groups,dc=deuxfleurs,dc=fr",
+
+  "s3_endpoint": "garage.deuxfleurs.fr",
+  "s3_access_key": "{{ key "secrets/directory/guichet/s3_access_key" | trimSpace }}",
+  "s3_secret_key": "{{ key "secrets/directory/guichet/s3_secret_key" | trimSpace }}",
+  "s3_region": "garage",
+  "s3_bucket": "bottin-pictures"
 }
 
diff --git a/app/directory/deploy/directory.hcl b/app/directory/deploy/directory.hcl
index 56176cf..3f6d625 100644
--- a/app/directory/deploy/directory.hcl
+++ b/app/directory/deploy/directory.hcl
@@ -69,7 +69,7 @@ job "directory" {
     task "guichet" {
       driver = "docker"
       config {
-        image = "superboum/guichet_amd64:12"
+        image = "lxpz/guichet_amd64:13"
         readonly_rootfs = true
         ports = [ "web_port" ]
         volumes = [
diff --git a/app/directory/secrets/directory/guichet/s3_access_key b/app/directory/secrets/directory/guichet/s3_access_key
new file mode 100644
index 0000000..e5b37ff
--- /dev/null
+++ b/app/directory/secrets/directory/guichet/s3_access_key
@@ -0,0 +1 @@
+USER Garage access key for Guichet profile pictures
diff --git a/app/directory/secrets/directory/guichet/s3_secret_key b/app/directory/secrets/directory/guichet/s3_secret_key
new file mode 100644
index 0000000..f3e7f0f
--- /dev/null
+++ b/app/directory/secrets/directory/guichet/s3_secret_key
@@ -0,0 +1 @@
+USER Garage secret key for Guichet profile pictures
diff --git a/app/directory/secrets/directory/guichet/smtp_pass b/app/directory/secrets/directory/guichet/smtp_pass
new file mode 100644
index 0000000..fc9d1e3
--- /dev/null
+++ b/app/directory/secrets/directory/guichet/smtp_pass
@@ -0,0 +1 @@
+USER SMTP password
diff --git a/app/directory/secrets/directory/guichet/smtp_user b/app/directory/secrets/directory/guichet/smtp_user
new file mode 100644
index 0000000..c9c8bd0
--- /dev/null
+++ b/app/directory/secrets/directory/guichet/smtp_user
@@ -0,0 +1 @@
+USER SMTP username