nextcloud: fix vault template keys

This commit is contained in:
Brad Stein 2026-01-14 13:00:21 -03:00
parent 0aa16757e9
commit 92fbde08eb
3 changed files with 19 additions and 18 deletions

View File

@ -20,18 +20,18 @@ spec:
vault.hashicorp.com/agent-inject-template-nextcloud-env.sh: | vault.hashicorp.com/agent-inject-template-nextcloud-env.sh: |
{{- with secret "kv/data/atlas/nextcloud/nextcloud-db" -}} {{- with secret "kv/data/atlas/nextcloud/nextcloud-db" -}}
export POSTGRES_DB="{{ .Data.data.database }}" export POSTGRES_DB="{{ .Data.data.database }}"
export POSTGRES_USER="{{ .Data.data.db-username }}" export POSTGRES_USER="{{ index .Data.data "db-username" }}"
export POSTGRES_PASSWORD="{{ .Data.data.db-password }}" export POSTGRES_PASSWORD="{{ index .Data.data "db-password" }}"
{{- end }} {{- end }}
{{- with secret "kv/data/atlas/nextcloud/nextcloud-admin" -}} {{- with secret "kv/data/atlas/nextcloud/nextcloud-admin" -}}
export NEXTCLOUD_ADMIN_USER="{{ .Data.data.admin-user }}" export NEXTCLOUD_ADMIN_USER="{{ index .Data.data "admin-user" }}"
export NEXTCLOUD_ADMIN_PASSWORD="{{ .Data.data.admin-password }}" export NEXTCLOUD_ADMIN_PASSWORD="{{ index .Data.data "admin-password" }}"
{{- end }} {{- end }}
export ADMIN_USER="${NEXTCLOUD_ADMIN_USER}" export ADMIN_USER="${NEXTCLOUD_ADMIN_USER}"
export ADMIN_PASS="${NEXTCLOUD_ADMIN_PASSWORD}" export ADMIN_PASS="${NEXTCLOUD_ADMIN_PASSWORD}"
{{- with secret "kv/data/atlas/nextcloud/nextcloud-oidc" -}} {{- with secret "kv/data/atlas/nextcloud/nextcloud-oidc" -}}
export OIDC_CLIENT_ID="{{ .Data.data.client-id }}" export OIDC_CLIENT_ID="{{ index .Data.data "client-id" }}"
export OIDC_CLIENT_SECRET="{{ .Data.data.client-secret }}" export OIDC_CLIENT_SECRET="{{ index .Data.data "client-secret" }}"
{{- end }} {{- end }}
{{- with secret "kv/data/atlas/shared/postmark-relay" -}} {{- with secret "kv/data/atlas/shared/postmark-relay" -}}
export SMTP_NAME="{{ index .Data.data "relay-username" }}" export SMTP_NAME="{{ index .Data.data "relay-username" }}"

View File

@ -17,23 +17,24 @@ spec:
app: nextcloud app: nextcloud
annotations: annotations:
vault.hashicorp.com/agent-inject: "true" vault.hashicorp.com/agent-inject: "true"
vault.hashicorp.com/agent-init-first: "true"
vault.hashicorp.com/role: "nextcloud" vault.hashicorp.com/role: "nextcloud"
vault.hashicorp.com/agent-inject-secret-nextcloud-env.sh: "kv/data/atlas/nextcloud/nextcloud-db" vault.hashicorp.com/agent-inject-secret-nextcloud-env.sh: "kv/data/atlas/nextcloud/nextcloud-db"
vault.hashicorp.com/agent-inject-template-nextcloud-env.sh: | vault.hashicorp.com/agent-inject-template-nextcloud-env.sh: |
{{- with secret "kv/data/atlas/nextcloud/nextcloud-db" -}} {{- with secret "kv/data/atlas/nextcloud/nextcloud-db" -}}
export POSTGRES_DB="{{ .Data.data.database }}" export POSTGRES_DB="{{ .Data.data.database }}"
export POSTGRES_USER="{{ .Data.data.db-username }}" export POSTGRES_USER="{{ index .Data.data "db-username" }}"
export POSTGRES_PASSWORD="{{ .Data.data.db-password }}" export POSTGRES_PASSWORD="{{ index .Data.data "db-password" }}"
{{- end }} {{- end }}
{{- with secret "kv/data/atlas/nextcloud/nextcloud-admin" -}} {{- with secret "kv/data/atlas/nextcloud/nextcloud-admin" -}}
export NEXTCLOUD_ADMIN_USER="{{ .Data.data.admin-user }}" export NEXTCLOUD_ADMIN_USER="{{ index .Data.data "admin-user" }}"
export NEXTCLOUD_ADMIN_PASSWORD="{{ .Data.data.admin-password }}" export NEXTCLOUD_ADMIN_PASSWORD="{{ index .Data.data "admin-password" }}"
{{- end }} {{- end }}
export ADMIN_USER="${NEXTCLOUD_ADMIN_USER}" export ADMIN_USER="${NEXTCLOUD_ADMIN_USER}"
export ADMIN_PASS="${NEXTCLOUD_ADMIN_PASSWORD}" export ADMIN_PASS="${NEXTCLOUD_ADMIN_PASSWORD}"
{{- with secret "kv/data/atlas/nextcloud/nextcloud-oidc" -}} {{- with secret "kv/data/atlas/nextcloud/nextcloud-oidc" -}}
export OIDC_CLIENT_ID="{{ .Data.data.client-id }}" export OIDC_CLIENT_ID="{{ index .Data.data "client-id" }}"
export OIDC_CLIENT_SECRET="{{ .Data.data.client-secret }}" export OIDC_CLIENT_SECRET="{{ index .Data.data "client-secret" }}"
{{- end }} {{- end }}
{{- with secret "kv/data/atlas/shared/postmark-relay" -}} {{- with secret "kv/data/atlas/shared/postmark-relay" -}}
export SMTP_NAME="{{ index .Data.data "relay-username" }}" export SMTP_NAME="{{ index .Data.data "relay-username" }}"

View File

@ -18,18 +18,18 @@ spec:
vault.hashicorp.com/agent-inject-template-nextcloud-env.sh: | vault.hashicorp.com/agent-inject-template-nextcloud-env.sh: |
{{- with secret "kv/data/atlas/nextcloud/nextcloud-db" -}} {{- with secret "kv/data/atlas/nextcloud/nextcloud-db" -}}
export POSTGRES_DB="{{ .Data.data.database }}" export POSTGRES_DB="{{ .Data.data.database }}"
export POSTGRES_USER="{{ .Data.data.db-username }}" export POSTGRES_USER="{{ index .Data.data "db-username" }}"
export POSTGRES_PASSWORD="{{ .Data.data.db-password }}" export POSTGRES_PASSWORD="{{ index .Data.data "db-password" }}"
{{- end }} {{- end }}
{{- with secret "kv/data/atlas/nextcloud/nextcloud-admin" -}} {{- with secret "kv/data/atlas/nextcloud/nextcloud-admin" -}}
export NEXTCLOUD_ADMIN_USER="{{ .Data.data.admin-user }}" export NEXTCLOUD_ADMIN_USER="{{ index .Data.data "admin-user" }}"
export NEXTCLOUD_ADMIN_PASSWORD="{{ .Data.data.admin-password }}" export NEXTCLOUD_ADMIN_PASSWORD="{{ index .Data.data "admin-password" }}"
{{- end }} {{- end }}
export ADMIN_USER="${NEXTCLOUD_ADMIN_USER}" export ADMIN_USER="${NEXTCLOUD_ADMIN_USER}"
export ADMIN_PASS="${NEXTCLOUD_ADMIN_PASSWORD}" export ADMIN_PASS="${NEXTCLOUD_ADMIN_PASSWORD}"
{{- with secret "kv/data/atlas/nextcloud/nextcloud-oidc" -}} {{- with secret "kv/data/atlas/nextcloud/nextcloud-oidc" -}}
export OIDC_CLIENT_ID="{{ .Data.data.client-id }}" export OIDC_CLIENT_ID="{{ index .Data.data "client-id" }}"
export OIDC_CLIENT_SECRET="{{ .Data.data.client-secret }}" export OIDC_CLIENT_SECRET="{{ index .Data.data "client-secret" }}"
{{- end }} {{- end }}
{{- with secret "kv/data/atlas/shared/postmark-relay" -}} {{- with secret "kv/data/atlas/shared/postmark-relay" -}}
export SMTP_NAME="{{ index .Data.data "relay-username" }}" export SMTP_NAME="{{ index .Data.data "relay-username" }}"