Split diagnostic tasks into a new role

24 files changed, 57 insertions, 45 deletions

diff --git a/diagnostics.yml b/diagnostics.yml
new file mode 100644
index 0000000..69ef2ab
--- /dev/null
+++ b/diagnostics.yml
@@ -0,0 +1,5 @@
+- hosts: all
+  remote_user: root
+  any_errors_fatal: true
+  roles:
+    - diagnostics
diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
index 65700e8..bb3b8d2 100644
--- a/roles/common/handlers/main.yml
+++ b/roles/common/handlers/main.yml
@@ -1,4 +1,2 @@
 - import_tasks: ssh.yml
-- import_tasks: aide.yml
-- import_tasks: rkhunter.yml
 - import_tasks: systemd.yml
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index f9e110d..4c3d00a 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -20,9 +20,6 @@
 ##- name: Configuration du fichier hôte
 ##  import_tasks: host.yml
 
-- name: Configuration démon Cron
-  import_tasks: cron.yml
-
 - name: Configurations variables fichier setvars
   import_tasks: setvars.yml
 
@@ -48,13 +45,6 @@
 - name: État des services
   import_tasks: services.yml
 
-- name: Installation du HIDS AIDE
-  import_tasks: aide.yml
-
-- name: Installation de rkhunter
-  import_tasks: rkhunter.yml
-  when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
-
 - name: Changement de shell pour root
   import_tasks: zsh.yml
 
diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml
index 17bf5d9..316af79 100644
--- a/roles/common/tasks/pkgs.yml
+++ b/roles/common/tasks/pkgs.yml
@@ -58,23 +58,6 @@
     - util-linux-user
   when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22
 
-- name: Installation des paquets disgnostic matériel
-  dnf: name={{ item }} state=present
-  with_items:
-    - hddtemp
-    - smartmontools
-  when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
-
-- name: Installation du paquet memtest pour archi x86_64
-  dnf: name=memtest86+ state=present
-  when: ansible_architecture == "x86_64" and
-        ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
-
-- name: Installation du paquet lm_sensors pour archi x86_64
-  dnf: name=lm_sensors state=present
-  when: ansible_architecture == "x86_64" and
-        ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
-
 - name: Installation d'un programme de gravure
   dnf: name=wodim state=present
   when: ansible_devices.sr0 is defined
diff --git a/roles/common/tasks/selinux.yml b/roles/common/tasks/selinux.yml
index 92268e7..7f6fb2f 100644
--- a/roles/common/tasks/selinux.yml
+++ b/roles/common/tasks/selinux.yml
@@ -1,10 +1,3 @@
-- name: Rapport SELinux
-  copy:
-    src: eaureport.sh
-    dest: /etc/cron.daily/eaureport.sh
-    mode: 0755
-  when: ansible_selinux.status != "disabled"
-
 - name: Relabel système de fichier
   copy:
     src: selinuxresto.sh
diff --git a/roles/common/tasks/services.yml b/roles/common/tasks/services.yml
index 0f7343b..28369ee 100644
--- a/roles/common/tasks/services.yml
+++ b/roles/common/tasks/services.yml
@@ -2,15 +2,6 @@
   service: name=gpm state=started enabled=yes
   when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
 
-- name: Activation et démarrage du service lm_sensors
-  service: name=lm_sensors state=started enabled=yes
-  when: ansible_architecture == "x86_64" and
-        ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
-
-- name: Activation et démarrage du service Smartd
-  service: name=smartd state=started enabled=yes
-  when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
-
 - name: Activation et démarrage du service At
   service: name=atd state=started enabled=yes
 
diff --git a/roles/common/files/aideinit.sh b/roles/diagnostics/files/aideinit.sh
index ae9eda7..ae9eda7 100755
--- a/roles/common/files/aideinit.sh
+++ b/roles/diagnostics/files/aideinit.sh
diff --git a/roles/common/files/aidereport.sh b/roles/diagnostics/files/aidereport.sh
index fa56fe4..fa56fe4 100755
--- a/roles/common/files/aidereport.sh
+++ b/roles/diagnostics/files/aidereport.sh
diff --git a/roles/common/files/eaureport.sh b/roles/diagnostics/files/eaureport.sh
index 119fc41..119fc41 100755
--- a/roles/common/files/eaureport.sh
+++ b/roles/diagnostics/files/eaureport.sh
diff --git a/roles/common/files/rpmreport.sh b/roles/diagnostics/files/rpmreport.sh
index 25ca420..25ca420 100755
--- a/roles/common/files/rpmreport.sh
+++ b/roles/diagnostics/files/rpmreport.sh
diff --git a/roles/common/files/uptimereport.sh b/roles/diagnostics/files/uptimereport.sh
index 65a07ed..65a07ed 100755
--- a/roles/common/files/uptimereport.sh
+++ b/roles/diagnostics/files/uptimereport.sh
diff --git a/roles/common/handlers/aide.yml b/roles/diagnostics/handlers/aide.yml
index 4d5cdfc..4d5cdfc 100644
--- a/roles/common/handlers/aide.yml
+++ b/roles/diagnostics/handlers/aide.yml
diff --git a/roles/diagnostics/handlers/main.yml b/roles/diagnostics/handlers/main.yml
new file mode 100644
index 0000000..037a724
--- /dev/null
+++ b/roles/diagnostics/handlers/main.yml
@@ -0,0 +1,2 @@
+- import_tasks: aide.yml
+- import_tasks: rkhunter.yml
diff --git a/roles/common/handlers/rkhunter.yml b/roles/diagnostics/handlers/rkhunter.yml
index d332d08..d332d08 100644
--- a/roles/common/handlers/rkhunter.yml
+++ b/roles/diagnostics/handlers/rkhunter.yml
diff --git a/roles/common/tasks/aide.yml b/roles/diagnostics/tasks/aide.yml
index a8640fd..a8640fd 100644
--- a/roles/common/tasks/aide.yml
+++ b/roles/diagnostics/tasks/aide.yml
diff --git a/roles/common/tasks/cron.yml b/roles/diagnostics/tasks/cron.yml
index 7646287..7646287 100644
--- a/roles/common/tasks/cron.yml
+++ b/roles/diagnostics/tasks/cron.yml
diff --git a/roles/diagnostics/tasks/main.yml b/roles/diagnostics/tasks/main.yml
new file mode 100644
index 0000000..613a3b5
--- /dev/null
+++ b/roles/diagnostics/tasks/main.yml
@@ -0,0 +1,18 @@
+- name: Configuration démon Cron
+  import_tasks: cron.yml
+
+- name: Installation des logiciels de base
+  import_tasks: pkgs.yml
+
+- name: État des services
+  import_tasks: services.yml
+
+- name: Installation du HIDS AIDE
+  import_tasks: aide.yml
+
+- name: Installation de rkhunter
+  import_tasks: rkhunter.yml
+  when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
+
+- name: Crontasks pour SELinux
+  import_tasks: selinux.yml
diff --git a/roles/diagnostics/tasks/pkgs.yml b/roles/diagnostics/tasks/pkgs.yml
new file mode 100644
index 0000000..2861700
--- /dev/null
+++ b/roles/diagnostics/tasks/pkgs.yml
@@ -0,0 +1,16 @@
+- name: Installation des paquets disgnostic matériel
+  dnf: name={{ item }} state=present
+  with_items:
+    - hddtemp
+    - smartmontools
+  when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
+
+- name: Installation du paquet memtest pour archi x86_64
+  dnf: name=memtest86+ state=present
+  when: ansible_architecture == "x86_64" and
+        ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
+
+- name: Installation du paquet lm_sensors pour archi x86_64
+  dnf: name=lm_sensors state=present
+  when: ansible_architecture == "x86_64" and
+        ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
diff --git a/roles/common/tasks/rkhunter.yml b/roles/diagnostics/tasks/rkhunter.yml
index 460073a..460073a 100644
--- a/roles/common/tasks/rkhunter.yml
+++ b/roles/diagnostics/tasks/rkhunter.yml
diff --git a/roles/diagnostics/tasks/selinux.yml b/roles/diagnostics/tasks/selinux.yml
new file mode 100644
index 0000000..0acf948
--- /dev/null
+++ b/roles/diagnostics/tasks/selinux.yml
@@ -0,0 +1,6 @@
+- name: Rapport SELinux
+  copy:
+    src: eaureport.sh
+    dest: /etc/cron.daily/eaureport.sh
+    mode: 0755
+  when: ansible_selinux.status != "disabled"
diff --git a/roles/diagnostics/tasks/services.yml b/roles/diagnostics/tasks/services.yml
new file mode 100644
index 0000000..1baee1f
--- /dev/null
+++ b/roles/diagnostics/tasks/services.yml
@@ -0,0 +1,9 @@
+- name: Activation et démarrage du service lm_sensors
+  service: name=lm_sensors state=started enabled=yes
+  when: ansible_architecture == "x86_64" and
+        ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
+
+- name: Activation et démarrage du service Smartd
+  service: name=smartd state=started enabled=yes
+  when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
+
diff --git a/roles/common/templates/diskcheck.sh.j2 b/roles/diagnostics/templates/diskcheck.sh.j2
index 137dfdc..137dfdc 100644
--- a/roles/common/templates/diskcheck.sh.j2
+++ b/roles/diagnostics/templates/diskcheck.sh.j2
diff --git a/roles/common/templates/diskreport.sh.j2 b/roles/diagnostics/templates/diskreport.sh.j2
index e27f70e..e27f70e 100644
--- a/roles/common/templates/diskreport.sh.j2
+++ b/roles/diagnostics/templates/diskreport.sh.j2
diff --git a/site.yml b/site.yml
index 912c584..adf64da 100644
--- a/site.yml
+++ b/site.yml
@@ -5,6 +5,7 @@
   roles:
     - common
 
+- import_playbook: diagnostics.yml
 - import_playbook: ntpserver.yml
 - import_playbook: mtaserver.yml
 - import_playbook: clients.yml