Update to 2022-09-02 10:00

This commit is contained in:
Daniel Berteaud
2022-09-02 10:00:20 +02:00
parent c6ecd988cf
commit 67bfcd5db3
12 changed files with 73 additions and 25 deletions

View File

@@ -4,7 +4,7 @@ set -eo pipefail
{% if vault_letsencrypt_cert is defined %}
if [ $1 == "{{ pg_letsencrypt_cert }}" ]; then
if [ $1 == "{{ vault_letsencrypt_cert }}" ]; then
cp /var/lib/dehydrated/certificates/certs/{{ vault_letsencrypt_cert }}/fullchain.pem {{ vault_root_dir }}/tls/vault.crt
cp /var/lib/dehydrated/certificates/certs/{{ vault_letsencrypt_cert }}/privkey.pem {{ vault_root_dir }}/tls/vault.key
chown root:vault {{ vault_root_dir }}/tls/vault.key

View File

@@ -0,0 +1,8 @@
{{ vault_root_dir }}/log/*.log {{ vault_root_dir }}/log/*.json {
daily
rotate 365
compress
missingok
copytruncate
su {{ vault_user }} {{ vault_user }}
}

View File

@@ -51,11 +51,7 @@ service_registration "consul" {
{% endif %}
{% endfor %}
{% if vault_conf.service_registration.service_tags is defined %}
service_tags = [
{% for tag in vault_conf.service_registration.service_tags %}
"{{ tag }}",
{% endfor %}
]
service_tags = "{{ vault_conf.service_registration.service_tags | join(',') }}"
{% endif %}
}
{% endif %}