diff --git a/example/cloudbeaver.nomad.hcl b/example/cloudbeaver.nomad.hcl index f443b95..68806ea 100644 --- a/example/cloudbeaver.nomad.hcl +++ b/example/cloudbeaver.nomad.hcl @@ -153,8 +153,8 @@ _EOT PGDATABASE=cloudbeaver PGHOST=127.0.0.1 PGPORT=5432 -PGUSER={{ with secret "/database/creds/cloudbeaver" }}{{ .Data.username }}{{ end }} -PGPASSWORD={{ with secret "/database/creds/cloudbeaver" }}{{ .Data.password }}{{ end }} +PGUSER={{ with secret "database/creds/cloudbeaver" }}{{ .Data.username }}{{ end }} +PGPASSWORD={{ with secret "database/creds/cloudbeaver" }}{{ .Data.password }}{{ end }} _EOT destination = "secrets/.db.env" perms = 0400 @@ -279,7 +279,7 @@ _EOT data = <<_EOT { adminName: "cloudbeaver", - adminPassword: "{{ with secret "/kv/service/cloudbeaver" }}{{ .Data.data.initial_admin_pwd }}{{ end }}", + adminPassword: "{{ with secret "kv/service/cloudbeaver" }}{{ .Data.data.initial_admin_pwd }}{{ end }}", teams: [ { subjectId: "admin", diff --git a/example/init/cloudbeaver-vault-database b/example/init/cloudbeaver-vault-database index 129f226..01eab24 100755 --- a/example/init/cloudbeaver-vault-database +++ b/example/init/cloudbeaver-vault-database @@ -2,7 +2,7 @@ set -euo pipefail -vault write /database/roles/cloudbeaver \ +vault write database/roles/cloudbeaver \ db_name="postgres" \ creation_statements="CREATE ROLE \"{{name}}\" WITH LOGIN PASSWORD '{{password}}' VALID UNTIL '{{expiration}}'; \ GRANT \"cloudbeaver\" TO \"{{name}}\"; \ diff --git a/example/prep.d/10-cloudbeaver-rand-secrets.sh b/example/prep.d/10-cloudbeaver-rand-secrets.sh index 436be23..46a55df 100755 --- a/example/prep.d/10-cloudbeaver-rand-secrets.sh +++ b/example/prep.d/10-cloudbeaver-rand-secrets.sh @@ -5,7 +5,7 @@ set -euo pipefail # vim: syntax=sh export LC_ALL=C -VAULT_KV_PATH=/kv/service/cloudbeaver +VAULT_KV_PATH=kv/service/cloudbeaver RAND_CMD="tr -dc A-Za-z0-9\-_\/=~\.+ < /dev/urandom | head -c 50" if ! vault kv list $(dirname ${VAULT_KV_PATH}) 2>/dev/null | grep -q -E "^$(basename ${VAULT_KV_PATH})\$"; then vault kv put ${VAULT_KV_PATH} \ diff --git a/example/vault/policies/cloudbeaver.hcl b/example/vault/policies/cloudbeaver.hcl index a3f591d..d4ff54f 100644 --- a/example/vault/policies/cloudbeaver.hcl +++ b/example/vault/policies/cloudbeaver.hcl @@ -1,7 +1,7 @@ -path "/kv/data/service/cloudbeaver" { +path "kv/data/service/cloudbeaver" { capabilities = ["read"] } -path "/database/creds/cloudbeaver" { +path "database/creds/cloudbeaver" { capabilities = ["read"] }