From 65750d2aa6199d06fe78a089aa9d5ce96c4289f7 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Mon, 30 Aug 2021 09:24:57 +0200
Subject: [PATCH] evomaintenance: extract a config.yyml tasks file

---
 CHANGELOG.md                                   |  1 +
 evomaintenance/tasks/config.yml                | 18 ++++++++++++++++++
 evomaintenance/tasks/install_vendor_debian.yml | 13 +------------
 evomaintenance/tasks/main.yml                  | 11 ++---------
 evomaintenance/tasks/minifirewall.yml          |  3 +++
 5 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 evomaintenance/tasks/config.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f14be146..31ef9b18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ The **patch** part changes incrementally at each release.
 * certbot: silence letsencrypt deprecation warnings
 * elasticsearch: 7.x by default
 * evoadmin-web: simpler PHP packages lists
+* evomaintenance: extract a config.yyml tasks file
 * evocheck: upstream release 21.07
 * evolinux-base: alert5 comes after the network
 * evolinux-base: force Debian version to buster for Evolix repository (temporary)
diff --git a/evomaintenance/tasks/config.yml b/evomaintenance/tasks/config.yml
new file mode 100644
index 00000000..097e9770
--- /dev/null
+++ b/evomaintenance/tasks/config.yml
@@ -0,0 +1,18 @@
+---
+
+- assert:
+    that:
+      - evomaintenance_api_endpoint is not none
+      - evomaintenance_api_key is not none
+    msg: evomaintenance api variables must be set
+
+- name: Configuration is installed
+  template:
+    src: evomaintenance.j2
+    dest: /etc/evomaintenance.cf
+    owner: root
+    group: root
+    mode: "0600"
+    force: "{{ evomaintenance_force_config | bool }}"
+  tags:
+    - evomaintenance
diff --git a/evomaintenance/tasks/install_vendor_debian.yml b/evomaintenance/tasks/install_vendor_debian.yml
index 2faaac79..99448e3c 100644
--- a/evomaintenance/tasks/install_vendor_debian.yml
+++ b/evomaintenance/tasks/install_vendor_debian.yml
@@ -46,15 +46,4 @@
     - { src: 'evomaintenance.sh', dest: '/usr/share/scripts/', mode: '0700' }
     - { src: 'evomaintenance.tpl', dest: '/usr/share/scripts/', mode: '0600' }
   tags:
-    - evomaintenance
-
-- name: Configuration is installed
-  template:
-    src: evomaintenance.j2
-    dest: /etc/evomaintenance.cf
-    owner: root
-    group: root
-    mode: "0600"
-    force: "{{ evomaintenance_force_config | bool }}"
-  tags:
-    - evomaintenance
+    - evomaintenance
\ No newline at end of file
diff --git a/evomaintenance/tasks/main.yml b/evomaintenance/tasks/main.yml
index 9826089b..0a4e5010 100644
--- a/evomaintenance/tasks/main.yml
+++ b/evomaintenance/tasks/main.yml
@@ -1,14 +1,5 @@
 ---
 
-- set_fact:
-    minifirewall_restart_handler_name: "{{ minifirewall_restart_if_needed | bool | ternary('restart minifirewall', 'restart minifirewall (noop)') }}"
-
-- assert:
-    that:
-      - evomaintenance_api_endpoint is not none
-      - evomaintenance_api_key is not none
-    msg: evomaintenance api variables must be set
-
 - include: install_package_debian.yml
   when:
     - not (evomaintenance_install_vendor | bool)
@@ -19,6 +10,8 @@
     - evomaintenance_install_vendor | bool
     - ansible_distribution == "Debian"
 
+- include: config.yml
+
 - include: minifirewall.yml
   when:
     - evomaintenance_hook_db | bool
diff --git a/evomaintenance/tasks/minifirewall.yml b/evomaintenance/tasks/minifirewall.yml
index ad48e856..98dad15b 100644
--- a/evomaintenance/tasks/minifirewall.yml
+++ b/evomaintenance/tasks/minifirewall.yml
@@ -1,5 +1,8 @@
 ---
 
+- set_fact:
+    minifirewall_restart_handler_name: "{{ minifirewall_restart_if_needed | bool | ternary('restart minifirewall', 'restart minifirewall (noop)') }}"
+
 - name: Is minifirewall installed?
   stat:
     path: /etc/default/minifirewall