From 36c24f87a3b41292df989eba04830a67ce8be2e2 Mon Sep 17 00:00:00 2001
From: Michael Schmitz <michael.schmitz@centerdevice.com>
Date: Wed, 29 Nov 2023 11:51:43 +0100
Subject: [PATCH] [#186577997] Update config files for Version 1.12

---
 templates/etc/consul.d/main.json.j2 |  4 +++-
 templates/etc/consul.d/tls.json.j2  | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/templates/etc/consul.d/main.json.j2 b/templates/etc/consul.d/main.json.j2
index a89c123..eee9125 100644
--- a/templates/etc/consul.d/main.json.j2
+++ b/templates/etc/consul.d/main.json.j2
@@ -18,7 +18,9 @@
   "raft_protocol": {{ _consul.raft_protocol }},
 {% endif %}
 {% if _consul.ui is defined %}
-  "ui": {{ _consul.ui  | lower }},
+  "ui_config": {
+    "enabled": {{ _consul.ui  | lower }}
+  },
 {% endif %}
   "enable_local_script_checks": true,
   "dns_config": {
diff --git a/templates/etc/consul.d/tls.json.j2 b/templates/etc/consul.d/tls.json.j2
index 90788c7..6a8c4f3 100644
--- a/templates/etc/consul.d/tls.json.j2
+++ b/templates/etc/consul.d/tls.json.j2
@@ -1,8 +1,14 @@
 {
-  "verify_outgoing": {{ _consul.crypto.tls.verify_outgoing|default("true") }},
-  "verify_server_hostname": {{ _consul.crypto.tls.verify_server_hostname|default("true") }},
-  "verify_incoming": {{ _consul.crypto.tls.verify_incoming|default("true") }},
-  "ca_file": "{{ _consul.crypto.tls.ca_file }}",
-  "cert_file": "{{ _consul.config_dir}}/{{ _consul.crypto.tls.cert_file }}",
-  "key_file": "{{ _consul.config_dir}}/{{ _consul.crypto.tls.key_file.name }}"
+  "tls": {
+    "defaults": {
+      "ca_file": "{{ _consul.crypto.tls.ca_file }}",
+      "cert_file": "{{ _consul.config_dir}}/{{ _consul.crypto.tls.cert_file }}",
+      "key_file": "{{ _consul.config_dir}}/{{ _consul.crypto.tls.key_file.name }}",
+      "verify_incoming": {{ _consul.crypto.tls.verify_incoming|default("true") }},
+      "verify_outgoing": {{ _consul.crypto.tls.verify_outgoing|default("true") }}
+      },
+    "internal_rpc": {
+      "verify_server_hostname": {{ _consul.crypto.tls.verify_server_hostname|default("true") }}
+      }
+  }
 }