From 5da921572eb56f8182f2bdd483431cb9ac797565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dubois?= <jdubois@evolix.fr>
Date: Thu, 1 Sep 2022 17:05:20 +0200
Subject: [PATCH] base: export evomaintenance and evobackup tasks into their
 own roles, resolves #35

---
 CHANGELOG                                                       | 1 +
 README.md                                                       | 2 +-
 evolixisation.yml                                               | 2 ++
 roles/base/tasks/main.yml                                       | 2 --
 roles/{base => evobackup}/files/zzz_evobackup                   | 0
 roles/{base/tasks/evobackup.yml => evobackup/tasks/main.yml}    | 0
 .../{base/templates => evomaintenance/files}/evomaintenance.j2  | 0
 roles/{base => evomaintenance}/files/evomaintenance.sh          | 0
 roles/{base => evomaintenance}/files/evomaintenance.tpl         | 0
 .../tasks/evomaintenance.yml => evomaintenance/tasks/main.yml}  | 0
 10 files changed, 4 insertions(+), 3 deletions(-)
 rename roles/{base => evobackup}/files/zzz_evobackup (100%)
 rename roles/{base/tasks/evobackup.yml => evobackup/tasks/main.yml} (100%)
 rename roles/{base/templates => evomaintenance/files}/evomaintenance.j2 (100%)
 rename roles/{base => evomaintenance}/files/evomaintenance.sh (100%)
 rename roles/{base => evomaintenance}/files/evomaintenance.tpl (100%)
 rename roles/{base/tasks/evomaintenance.yml => evomaintenance/tasks/main.yml} (100%)

diff --git a/CHANGELOG b/CHANGELOG
index bc3bc48..03a6611 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - base: do not erase custom configuration of servers in doas.conf
 - base: vmd and pass are not used in our infrastructure, deletion of autocompletion
 - nagios-nrpe: do not erase custom configuration of servers in nrpe.d/evolix.cfg, and do not use zzz_evolix.cfg anymore
+- base: export evomaintenance and evobackup tasks into their own roles
 
 ### Fixed
 
diff --git a/README.md b/README.md
index 55a0655..39d08a4 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Several tags in the format `*utils` are configured to update the different scrip
 
 * utils : update scripts from base role, utils.yml task
 * motd-utils : update script from post-install role, motd.yml task
-* evomaintenance-utils : update scripts from base role, evomaintenance.yml task
+* evomaintenance-utils : update scripts from evomaintenance role, main.yml task
 * evocheck-utils : update scripts from evocheck role, main.yml task
 * nagios-nrpe-utils : update scripts and checks from nagios-nrpe role, main.yml task
 * etc-git-utils : update scripts from etc-git role, utils.yml task
diff --git a/evolixisation.yml b/evolixisation.yml
index 0d2d914..f74f73a 100644
--- a/evolixisation.yml
+++ b/evolixisation.yml
@@ -31,6 +31,7 @@
       tags: always
 
   roles:
+    - evomaintenance
     - etc-git
     - base
     - forwarding
@@ -38,6 +39,7 @@
     - accounts
     - nagios-nrpe
     - evocheck
+    - evobackup
     - post-install
     # - ospf
     # - bgp
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 2391d8e..b0a3422 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -3,10 +3,8 @@
 - include: packages.yml
 - include: doas.yml
 - include: dotfiles.yml
-- include: evomaintenance.yml
 - include: mail.yml
 - include: sudo.yml
-- include: evobackup.yml
 - include: newsyslog.yml
 - include: cron.yml
 - include: fstab_entries.yml
diff --git a/roles/base/files/zzz_evobackup b/roles/evobackup/files/zzz_evobackup
similarity index 100%
rename from roles/base/files/zzz_evobackup
rename to roles/evobackup/files/zzz_evobackup
diff --git a/roles/base/tasks/evobackup.yml b/roles/evobackup/tasks/main.yml
similarity index 100%
rename from roles/base/tasks/evobackup.yml
rename to roles/evobackup/tasks/main.yml
diff --git a/roles/base/templates/evomaintenance.j2 b/roles/evomaintenance/files/evomaintenance.j2
similarity index 100%
rename from roles/base/templates/evomaintenance.j2
rename to roles/evomaintenance/files/evomaintenance.j2
diff --git a/roles/base/files/evomaintenance.sh b/roles/evomaintenance/files/evomaintenance.sh
similarity index 100%
rename from roles/base/files/evomaintenance.sh
rename to roles/evomaintenance/files/evomaintenance.sh
diff --git a/roles/base/files/evomaintenance.tpl b/roles/evomaintenance/files/evomaintenance.tpl
similarity index 100%
rename from roles/base/files/evomaintenance.tpl
rename to roles/evomaintenance/files/evomaintenance.tpl
diff --git a/roles/base/tasks/evomaintenance.yml b/roles/evomaintenance/tasks/main.yml
similarity index 100%
rename from roles/base/tasks/evomaintenance.yml
rename to roles/evomaintenance/tasks/main.yml