From ae7093ac2632862f284627e140eb7e015b2d17ad Mon Sep 17 00:00:00 2001 From: Donien <88634789+Donien@users.noreply.github.com> Date: Wed, 31 Jul 2024 15:05:59 +0200 Subject: [PATCH] Use correct variable for insecure tls connection The value of `icingadb_database_tls_insecure` is meant to be used in the IcingaDB config template if the variable is defined. Prior to this change the condition checked against `icingadb_database_tls_insecure` while the used value was `icingadb_database_insecure`. Both cases now refer to `icingadb_database_tls_insecure`. Fixes #302 --- changelogs/fragments/fix_issue_302.yml | 2 ++ roles/icingadb/templates/icingadb.ini.j2 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/fix_issue_302.yml diff --git a/changelogs/fragments/fix_issue_302.yml b/changelogs/fragments/fix_issue_302.yml new file mode 100644 index 00000000..b00cd4bf --- /dev/null +++ b/changelogs/fragments/fix_issue_302.yml @@ -0,0 +1,2 @@ +bugfixes: + - "The Icinga DB config template used two different variables to configure (in)secure TLS communication with the database. It now uses :code:`icingadb_database_tls_insecure` for both the condition and as the actual value (#302)." diff --git a/roles/icingadb/templates/icingadb.ini.j2 b/roles/icingadb/templates/icingadb.ini.j2 index cf012ac1..5cedae94 100644 --- a/roles/icingadb/templates/icingadb.ini.j2 +++ b/roles/icingadb/templates/icingadb.ini.j2 @@ -24,7 +24,7 @@ database: ca: {{ icingadb_database_ca }} {% endif %} {% if icingadb_database_tls_insecure is defined %} - insecure: {{ icingadb_database_insecure }} + insecure: {{ icingadb_database_tls_insecure }} {% endif %}