From 51240311888e12685514f66780d03e3a51e8ba5d Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 19 Jan 2024 13:46:13 +0100 Subject: [PATCH] Move pki script to init --- example/postgres.nomad.hcl | 10 +++++----- prep.d/20-pki.sh => init/pki | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename prep.d/20-pki.sh => init/pki (100%) diff --git a/example/postgres.nomad.hcl b/example/postgres.nomad.hcl index 135aa28..485c77f 100644 --- a/example/postgres.nomad.hcl +++ b/example/postgres.nomad.hcl @@ -296,9 +296,9 @@ postgresql: - hostssl all all 0.0.0.0/0 cert clientcert=verify-full pg_ident: - - patroni-map pg-{{ env "NOMAD_ALLOC_INDEX" }}.postgres.service.consul postgres - - patroni-map pg-{{ env "NOMAD_ALLOC_INDEX" }}.postgres.service.consul replicator - - patroni-map pg-{{ env "NOMAD_ALLOC_INDEX" }}.postgres.service.consul rewind + - patroni-map postgres.service.consul postgres + - patroni-map postgres.service.consul replicator + - patroni-map postgres.service.consul rewind parameters: ssl: on @@ -428,8 +428,8 @@ _EOT data = <<_EOT {{ with pkiCert "pki/postgres/issue/postgres-server" - (printf "common_name=pg-%s.postgres.service.consul" (env "NOMAD_ALLOC_INDEX")) - "alt_name=postgres.service.consul" + "common_name=postgres.service.consul" + (printf "alt_name=%s.postgres.service.consul" (env "NOMAD_ALLOC_INDEX")) (printf "ip_sans=%s" (env "NOMAD_IP_patroni")) "ttl=72h" }} {{ .Cert }} {{ .Key }} diff --git a/prep.d/20-pki.sh b/init/pki similarity index 100% rename from prep.d/20-pki.sh rename to init/pki