Deuxfleurs/nixcfg
17
6
Fork 2
Code Issues 15 Pull requests 2 Projects Releases Wiki Activity

staging: update guichet with website management

Browse source
This commit is contained in:
Alex 2023-10-05 18:51:13 +02:00
parent c790f6f3e1
commit fbffe1f0dc
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cluster/staging/app/directory/config/guichet/config.json.tpl
View file

@ -25,6 +25,9 @@
"group_can_admin": "cn=admin,ou=groups,{{ key "secrets/directory/ldap_base_dn" }}", "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" }}", "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_endpoint": "{{ key "secrets/directory/guichet/s3_endpoint" }}",
"s3_access_key": "{{ key "secrets/directory/guichet/s3_access_key" | trimSpace }}", "s3_access_key": "{{ key "secrets/directory/guichet/s3_access_key" | trimSpace }}",
"s3_secret_key": "{{ key "secrets/directory/guichet/s3_secret_key" | trimSpace }}", "s3_secret_key": "{{ key "secrets/directory/guichet/s3_secret_key" | trimSpace }}",

2
cluster/staging/app/directory/deploy/directory.hcl
View file

@ -93,7 +93,7 @@ EOH
driver = "nix2" driver = "nix2"
config { config {
packages = [ 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" command = "guichet"
} }

2
cluster/staging/app/garage/deploy/garage.hcl
View file

@ -27,7 +27,7 @@ job "garage-staging" {
"#bash", # so that we can enter a shell inside container "#bash", # so that we can enter a shell inside container
"#coreutils", "#coreutils",
# garage v0.9.0-rc1 # 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" command = "garage"
args = [ "server" ] args = [ "server" ]