per-bucket keys #68

Merged
quentin merged 9 commits from feat-per-bucket-key into main 2024-06-24 10:15:56 +00:00
2 changed files with 16 additions and 12 deletions
Showing only changes of commit 793cb2d3c2 - Show all commits

View file

@ -10,25 +10,23 @@
"invitation_base_dn": "ou=invitations,dc=bottin,dc=eu", "invitation_base_dn": "ou=invitations,dc=bottin,dc=eu",
"invitation_name_attr": "cn", "invitation_name_attr": "cn",
"invited_mail_format": "{}@example.com", "invited_mail_format": "{}@bottin.eu",
"invited_auto_groups": [ "invited_auto_groups": [ ],
"cn=email,ou=groups,dc=bottin,dc=eu"
],
"web_address": "http://guichet.localhost:9991", "web_address": "http://localhost:9991",
"mail_from": "welcome@example.com", "mail_from": "welcome@bottin.eu",
"smtp_server": "smtp.example.com", "smtp_server": "smtp.bottin.eu",
"smtp_username": "guichet", "smtp_username": "guichet",
"smtp_password": "", "smtp_password": "",
"admin_account": "cn=admin,dc=bottin,dc=eu", "admin_account": "cn=admin,dc=bottin,dc=eu",
"group_can_admin": "gid=admin,ou=groups,dc=bottin,dc=eu", "group_can_admin": "cn=admin,ou=groups,dc=bottin,dc=eu",
"group_can_invite": "", "group_can_invite": "cn=admin,ou=groups,dc=bottin,dc=eu",
"s3_admin_endpoint": "localhost:3903", "s3_admin_endpoint": "localhost:3903",
"s3_admin_token": "GlXP43PWH3LuvEGSNxKYzZCyUss8VqZmarBU+HUlrxw=", "s3_admin_token": "GlXP43PWH3LuvEGSNxKYzZCyUss8VqZmarBU+HUlrxw=",
"s3_endpoint": "localhost", "s3_endpoint": "localhost:3900",
"s3_access_key": "", "s3_access_key": "",
"s3_secret_key": "", "s3_secret_key": "",
"s3_region": "garage", "s3_region": "garage",

View file

@ -1,11 +1,15 @@
version: '3' version: '3'
services: services:
consul: consul:
image: hashicorp/consul:1.16 # sync with nixos stable packages assuming our stack is up to date
# https://search.nixos.org/packages?channel=24.05&from=0&size=50&sort=relevance&type=packages&query=consul
image: hashicorp/consul:1.18
restart: "always" restart: "always"
expose: expose:
- 8500 - 8500
bottin: bottin:
# sync with deuxfleurs/nixcfg/cluster/prod/app/core/deploy/bottin.hcl
# to ensure compatibility with prod
image: dxflrs/bottin:7h18i30cckckaahv87d3c86pn4a7q41z image: dxflrs/bottin:7h18i30cckckaahv87d3c86pn4a7q41z
#command: "-config /etc/bottin.json" #command: "-config /etc/bottin.json"
restart: "always" restart: "always"
@ -15,7 +19,9 @@ services:
volumes: volumes:
- "./config/bottin.json:/config.json" - "./config/bottin.json:/config.json"
garage: garage:
image: dxflrs/garage:v0.8.2 # sync with deuxfleurs/nixcfg/cluster/prod/app/garage/deploy/garage.hcl
# to ensure compatibility with prod
image: superboum/garage:v1.0.0-rc1-hotfix-red-ftr-wquorum
ports: ports:
- "3900:3900" - "3900:3900"
- "3902:3902" - "3902:3902"