diff options
author | Alex Auvolat <alex@adnab.me> | 2023-04-19 20:15:03 +0200 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2023-04-19 20:15:03 +0200 |
commit | 9737c661a4a69db016f890643a729e30612f1027 (patch) | |
tree | 9b1049cbfd2fdd3e15542d4ef07f2c3c93dfce78 /cluster/prod/app/guichet | |
parent | 07f50f297a8fcb3ccee167ca486084bafb2c1120 (diff) | |
parent | 57aa2ce1d22dfe7963afdfc1908ae2ba60184dcb (diff) | |
download | nixcfg-9737c661a4a69db016f890643a729e30612f1027.tar.gz nixcfg-9737c661a4a69db016f890643a729e30612f1027.zip |
Merge branch 'main' into simplify-network-config
Diffstat (limited to 'cluster/prod/app/guichet')
-rw-r--r-- | cluster/prod/app/guichet/config/guichet/config.json.tpl | 3 | ||||
-rw-r--r-- | cluster/prod/app/guichet/deploy/directory.hcl | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cluster/prod/app/guichet/config/guichet/config.json.tpl b/cluster/prod/app/guichet/config/guichet/config.json.tpl index 467c92d..51c119c 100644 --- a/cluster/prod/app/guichet/config/guichet/config.json.tpl +++ b/cluster/prod/app/guichet/config/guichet/config.json.tpl @@ -28,6 +28,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-admin.service.prod.consul:3903", + "s3_admin_token": "{{ key "secrets/garage/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/prod/app/guichet/deploy/directory.hcl b/cluster/prod/app/guichet/deploy/directory.hcl index 7e445ae..a64b7e6 100644 --- a/cluster/prod/app/guichet/deploy/directory.hcl +++ b/cluster/prod/app/guichet/deploy/directory.hcl @@ -13,7 +13,7 @@ job "guichet" { task "guichet" { driver = "docker" config { - image = "dxflrs/guichet:17" + image = "dxflrs/guichet:18" readonly_rootfs = true ports = [ "web_port" ] volumes = [ |