From 8d6e0aadbfa37da0274c88f7c3cfed5bdb56997e Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Thu, 6 Oct 2022 09:00:08 +0200
Subject: [PATCH] Update to 2022-10-06 09:00

---
 roles/consul/templates/agent_bundle.pem.tpl.j2 | 2 +-
 roles/consul/templates/consul.hcl.j2           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/consul/templates/agent_bundle.pem.tpl.j2 b/roles/consul/templates/agent_bundle.pem.tpl.j2
index b18edee..569df3f 100644
--- a/roles/consul/templates/agent_bundle.pem.tpl.j2
+++ b/roles/consul/templates/agent_bundle.pem.tpl.j2
@@ -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 ]]
diff --git a/roles/consul/templates/consul.hcl.j2 b/roles/consul/templates/consul.hcl.j2
index 80e97ac..dedc257 100644
--- a/roles/consul/templates/consul.hcl.j2
+++ b/roles/consul/templates/consul.hcl.j2
@@ -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 }}"