jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-04-16 18:23:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2022-10-06 09:00

Browse Source
This commit is contained in:
Daniel Berteaud 2022-10-06 09:00:08 +02:00
parent d9d938412c
commit 8d6e0aadbf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/consul/templates/agent_bundle.pem.tpl.j2
View File

@ -1,5 +1,5 @@
{% if consul_conf.server %}
[[ with pkiCert "{{ consul_vault_secrets.pki.path }}/issue/{{ consul_vault_secrets.pki.role }}" "common_name=server-{{ ansible_fqdn | regex_replace('\\.', '-') }}.{{ consul_conf.datacenter | default('dc1') }}.{{ consul_conf.domain | default('consul') }}" "alt_names=localhost,consul.service.{{ consul_conf.domain | default('consul') }},server.{{ consul_conf.datacenter | default('dc1') }}.{{ consul_conf.domain | default('consul') }}" ]]
[[ with pkiCert "{{ consul_vault_secrets.pki.path }}/issue/{{ consul_vault_secrets.pki.role }}" "common_name=server-{{ ansible_fqdn | regex_replace('\\.', '-') }}.{{ consul_conf.datacenter | default('dc1') }}.{{ consul_conf.domain | default('consul') }}" "alt_names=localhost,consul.service.{{ consul_conf.domain | default('consul') }},server.{{ consul_conf.datacenter | default('dc1') }}.{{ consul_conf.domain | default('consul') }}{% if consul_conf.alt_domain is defined %}consul.service.{{ consul_conf.alt_domain }},server.{{ consul_conf.datacenter | default('dc1') }}.{{ consul_conf.alt_domain }}{% endif %}" ]]
[[ .CA ]]
[[ .Cert ]]
[[ .Key ]]

2
roles/consul/templates/consul.hcl.j2
View File

@ -57,10 +57,10 @@ recursors = [
{% if consul_conf.domain is defined %}
domain = "{{ consul_conf.domain }}"
{% endif %}
{% if consul_conf.alt_domain is defined %}
alt_domain = "{{ consul_conf.alt_domain }}"
{% endif %}
{% endif %}
telemetry {
prometheus_retention_time = "{{ consul_conf.telemetry.prometheus_retention_time }}"