From 9f8aaebc31aeab502a89ba4a98b1fc6b91b7f8e6 Mon Sep 17 00:00:00 2001 From: Tobias Huste Date: Thu, 23 Jan 2025 08:52:39 +0100 Subject: [PATCH] Rename elasticsearch_url variable The variable is not prefixed with the role name. In order to prevent name clashes it is renamed to zammad_elasticsearch_url. --- roles/zammad/README.md | 2 +- roles/zammad/defaults/main.yml | 2 +- roles/zammad/handlers/main.yml | 2 +- roles/zammad/tasks/install.yml | 12 ++++++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/roles/zammad/README.md b/roles/zammad/README.md index c12e9ecd..c8d56737 100644 --- a/roles/zammad/README.md +++ b/roles/zammad/README.md @@ -119,7 +119,7 @@ configuring multiple domains or the redirection of outdated domains to the most recent one. ```yaml -elasticsearch_url: "http://localhost:9200" +zammad_elasticsearch_url: "http://localhost:9200" ``` Elasticsearch server address. diff --git a/roles/zammad/defaults/main.yml b/roles/zammad/defaults/main.yml index ad7edc5b..c5c13ee2 100644 --- a/roles/zammad/defaults/main.yml +++ b/roles/zammad/defaults/main.yml @@ -17,5 +17,5 @@ zammad_nginx_server_tokens: "off" zammad_force_es_searchindex_rebuild: false -elasticsearch_url: "http://localhost:9200" +zammad_elasticsearch_url: "http://localhost:9200" ... diff --git a/roles/zammad/handlers/main.yml b/roles/zammad/handlers/main.yml index a48d121b..54e5ebca 100644 --- a/roles/zammad/handlers/main.yml +++ b/roles/zammad/handlers/main.yml @@ -11,7 +11,7 @@ - name: "Set Elasticsearch server address" ansible.builtin.command: >- - zammad run rails r "Setting.set('es_url', '{{ elasticsearch_url | quote }}')" + zammad run rails r "Setting.set('es_url', '{{ zammad_elasticsearch_url | quote }}')" changed_when: true - name: "Build search index" diff --git a/roles/zammad/tasks/install.yml b/roles/zammad/tasks/install.yml index 27781933..28f30a0f 100644 --- a/roles/zammad/tasks/install.yml +++ b/roles/zammad/tasks/install.yml @@ -5,6 +5,18 @@ --- +- name: "Variable elasticsearch_url is deprecated" + ansible.builtin.debug: + msg: + - "The variable elasticsearch_url is deprecated and will be removed in the next major release." + - "Please use zammad_elasticsearch_url instead" + when: "elasticsearch_url is defined and elasticsearch_url | length > 0" + +- name: "Set variable zammad_elasticsearch_url for backwards compatibility" + ansible.builtin.set_fact: + zammad_elasticsearch_url: "{{ elasticsearch_url }}" + when: "elasticsearch_url is defined and elasticsearch_url | length > 0" + - name: "Configure Zammad repository for Centos-like" when: "ansible_distribution | lower == 'centos'" block: