vincent/homelab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix vault: lowercase in drone secret path
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
vincent 2023-08-25 10:15:06 +02:00
parent 3ac0213417
commit 071ac98956
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/database
View File

@ -16,7 +16,7 @@ postgresql_users:
- name: vaultwarden - name: vaultwarden
password: "{{ lookup('hashi_vault', 'secret=secrets/data/database/vaultwarden:password')}}" password: "{{ lookup('hashi_vault', 'secret=secrets/data/database/vaultwarden:password')}}"
- name: drone - name: drone
password: "{{ lookup('hashi_vault', 'secret=secrets/data/database/droneCI:password')}}" password: "{{ lookup('hashi_vault', 'secret=secrets/data/database/droneci:password')}}"
- name: dendrite - name: dendrite
password: "{{ lookup('hashi_vault', 'secret=secrets/data/database/dendrite:password')}}" password: "{{ lookup('hashi_vault', 'secret=secrets/data/database/dendrite:password')}}"
- name: paperless - name: paperless

2
nomad-job/drone-runner.nomad
View File

@ -26,7 +26,7 @@ job "drone-runner" {
} }
template { template {
data = <<EOH data = <<EOH
{{ with secret "secrets/data/nomad/droneCI"}} {{ with secret "secrets/data/nomad/droneci"}}
DRONE_RPC_HOST="drone.ducamps.win" DRONE_RPC_HOST="drone.ducamps.win"
DRONE_RPC_PROTO="https" DRONE_RPC_PROTO="https"
DRONE_RPC_SECRET= "{{ .Data.data.DRONE_RPC_SECRET}}" DRONE_RPC_SECRET= "{{ .Data.data.DRONE_RPC_SECRET}}"

8
nomad-job/drone.nomad
View File

@ -54,7 +54,7 @@ job "drone" {
} }
template { template {
data = <<EOH data = <<EOH
{{ with secret "secrets/data/nomad/droneCI"}} {{ with secret "secrets/data/nomad/droneci"}}
DRONE_GITEA_SERVER="https://git.ducamps.win" DRONE_GITEA_SERVER="https://git.ducamps.win"
DRONE_GITEA_CLIENT_ID="{{ .Data.data.DRONE_GITEA_CLIENT_ID }}" DRONE_GITEA_CLIENT_ID="{{ .Data.data.DRONE_GITEA_CLIENT_ID }}"
DRONE_GITEA_CLIENT_SECRET="{{ .Data.data.DRONE_GITEA_CLIENT_SECRET }}" DRONE_GITEA_CLIENT_SECRET="{{ .Data.data.DRONE_GITEA_CLIENT_SECRET }}"
@ -66,7 +66,7 @@ job "drone" {
DRONE_SERVER_PROTO="https" DRONE_SERVER_PROTO="https"
{{end}} {{end}}
{{ with secret "secrets/data/database/droneCI"}} {{ with secret "secrets/data/database/droneci"}}
DRONE_DATABASE_DATASOURCE="postgres://drone:{{ .Data.data.password }}@db1.ducamps.win:5432/drone?sslmode=disable" DRONE_DATABASE_DATASOURCE="postgres://drone:{{ .Data.data.password }}@db1.ducamps.win:5432/drone?sslmode=disable"
{{end}} {{end}}
EOH EOH
@ -90,7 +90,7 @@ job "drone" {
template { template {
data= <<EOH data= <<EOH
DRONE_DEBUG=true DRONE_DEBUG=true
{{ with secret "secrets/data/nomad/droneCI"}} {{ with secret "secrets/data/nomad/droneci"}}
DRONE_SECRET= {{ .Data.data.DRONE_VAULT_SECRET}} DRONE_SECRET= {{ .Data.data.DRONE_VAULT_SECRET}}
{{end}} {{end}}
VAULT_TOKEN= VAULT_TOKEN=
@ -98,7 +98,7 @@ job "drone" {
VAULT_AUTH_TYPE=approle VAULT_AUTH_TYPE=approle
VAULT_TOKEN_TTL=72h VAULT_TOKEN_TTL=72h
VAULT_TOKEN_RENEWAL=24h VAULT_TOKEN_RENEWAL=24h
{{ with secret "secrets/data/nomad/droneCI/approle"}} {{ with secret "secrets/data/nomad/droneci/approle"}}
VAULT_APPROLE_ID= {{ .Data.data.approleID}} VAULT_APPROLE_ID= {{ .Data.data.approleID}}
VAULT_APPROLE_SECRET= {{ .Data.data.approleSecretID}} VAULT_APPROLE_SECRET= {{ .Data.data.approleSecretID}}
{{end}} {{end}}

2
vault/nomad.tf
View File

@ -6,7 +6,7 @@ locals {
"crowdsec", "crowdsec",
"dump", "dump",
"dentrite", "dentrite",
"droneCI", "droneci",
"gandi", "gandi",
"gitea", "gitea",
"nextcloud", "nextcloud",