Update to 2022-09-06 18:00

This commit is contained in:
Daniel Berteaud
2022-09-06 18:00:22 +02:00
parent ac46e06fb3
commit 382804b568
33 changed files with 311 additions and 113 deletions

View File

@@ -73,8 +73,19 @@ connect {
{% endif %}
acl {
enabled = {{ consul_conf.acl.enabled | ternary('true', 'false') }}
{% for key in ['enabled', 'enable_token_persistence'] %}
{% if consul_conf.acl[key] is defined %}
{{ key }} = {{ consul_conf.acl[key] | ternary('true', 'false') }}
{% endif %}
{% endfor %}
default_policy = "{{ consul_conf.acl.default_policy }}"
tokens {
{% for key in ['initial_management', 'default', 'agent', 'agent_recovery', 'replication'] %}
{% if consul_conf.acl.tokens[key] is defined %}
{{ key }} = "{{ consul_conf.acl.tokens[key] }}"
{% endif %}
{% endfor %}
}
}
{% if consul_conf.tls.enabled %}
@@ -108,5 +119,4 @@ auto_encrypt {
tls = true
}
{% endif %}
{% endif %}