Small cleanup

This commit is contained in:
Daniel Berteaud 2024-01-17 16:51:47 +01:00
parent aec5da4e87
commit 63e31aed93
2 changed files with 9 additions and 8 deletions

View File

@ -27,7 +27,7 @@ job [[ .instance | toJSON ]] {
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].rule=Host(`fake-acme-host`) || PathPrefix(`/.well-known/acme-challenge/`)",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].priority=[[ $c.traefik.priority ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].entrypoints=[[ join $c.traefik.entrypoints "," ]]",
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].middlewares=[[ template "common/traefik_middlewares" $c.traefik ]]"
"[[ $c.traefik.instance ]].http.routers.[[ .instance ]][[ .consul.suffix ]].middlewares=[[ template "common/traefik_middlewares" $c ]]"
]
}
@ -47,10 +47,10 @@ job [[ .instance | toJSON ]] {
}
env {
[[- template "common/proxy_env" . -]]
[[ template "common/proxy_env" $c ]]
}
[[- template "common/file_env" $c.env ]]
[[ template "common/file_env" $c ]]
template {
data =<<_EOT
@ -87,11 +87,11 @@ ACME_[[ $acc_idx ]]_CERT_[[ $crt_idx ]]=[[ $crt ]]
[[- end ]]
_EOT
destination = "secrets/acm-to-vault.env"
perms = 0400
env = true
perms = 0400
env = true
}
[[ template "common/resources" .acme.resources ]]
[[ template "common/resources" $c ]]
}
}
}

View File

@ -48,7 +48,6 @@ job "acme-to-vault" {
image = "danielberteaud/acme-to-vault:24.1-2"
readonly_rootfs = true
pids_limit = 20
mount {
type = "tmpfs"
target = "/data"
@ -57,7 +56,6 @@ job "acme-to-vault" {
}
}
}
vault {
@ -65,7 +63,10 @@ job "acme-to-vault" {
}
env {
}
# Use a template block instead of env {} so we can fetch values from vault
template {
data = <<_EOT