From f159c83a270206c5dd6db695dd9e6aaf70b2ab69 Mon Sep 17 00:00:00 2001
From: Erik Berg <zabbix@slipsprogrammor.no>
Date: Mon, 25 Mar 2024 09:45:25 +0000
Subject: [PATCH] Prefix database task-files with initialize

It reflects more accurately what we're trying to achieve. Also
strip out zabbix_proxy_db_long, it serves no purpose anymore.
---
 roles/zabbix_proxy/tasks/{mysql.yml => initialize-mysql.yml} | 0
 .../tasks/{postgresql.yml => initialize-pgsql.yml}           | 0
 .../tasks/{sqlite3.yml => initialize-sqlite3.yml}            | 0
 roles/zabbix_proxy/tasks/main.yml                            | 5 ++---
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename roles/zabbix_proxy/tasks/{mysql.yml => initialize-mysql.yml} (100%)
 rename roles/zabbix_proxy/tasks/{postgresql.yml => initialize-pgsql.yml} (100%)
 rename roles/zabbix_proxy/tasks/{sqlite3.yml => initialize-sqlite3.yml} (100%)

diff --git a/roles/zabbix_proxy/tasks/mysql.yml b/roles/zabbix_proxy/tasks/initialize-mysql.yml
similarity index 100%
rename from roles/zabbix_proxy/tasks/mysql.yml
rename to roles/zabbix_proxy/tasks/initialize-mysql.yml
diff --git a/roles/zabbix_proxy/tasks/postgresql.yml b/roles/zabbix_proxy/tasks/initialize-pgsql.yml
similarity index 100%
rename from roles/zabbix_proxy/tasks/postgresql.yml
rename to roles/zabbix_proxy/tasks/initialize-pgsql.yml
diff --git a/roles/zabbix_proxy/tasks/sqlite3.yml b/roles/zabbix_proxy/tasks/initialize-sqlite3.yml
similarity index 100%
rename from roles/zabbix_proxy/tasks/sqlite3.yml
rename to roles/zabbix_proxy/tasks/initialize-sqlite3.yml
diff --git a/roles/zabbix_proxy/tasks/main.yml b/roles/zabbix_proxy/tasks/main.yml
index c9d0c34b9..7aded761a 100644
--- a/roles/zabbix_proxy/tasks/main.yml
+++ b/roles/zabbix_proxy/tasks/main.yml
@@ -14,7 +14,6 @@
 
 - name: Set More Variables
   ansible.builtin.set_fact:
-    zabbix_proxy_db_long: "{{ 'postgresql' if zabbix_proxy_database == 'pgsql' else zabbix_proxy_database }}"
     zabbix_short_version: "{{ zabbix_proxy_version | regex_replace('\\.', '') }}"
     zabbix_proxy_fpinglocation: "{{ zabbix_proxy_fpinglocation if zabbix_proxy_fpinglocation is defined else _zabbix_proxy_fpinglocation}}"
     zabbix_proxy_fping6location: "{{ zabbix_proxy_fping6location if zabbix_proxy_fping6location is defined else _zabbix_proxy_fping6location}}"
@@ -79,8 +78,8 @@
   tags:
     - database
 
-- name: "Installing the database"
-  ansible.builtin.include_tasks: "{{ zabbix_proxy_db_long }}.yml"
+- name: "Initialize the database"
+  ansible.builtin.include_tasks: "initialize-{{ zabbix_proxy_database }}.yml"
 
 - name: "Create include dir zabbix-proxy"
   ansible.builtin.file: