8 files changed, 75 insertions, 11 deletions
diff --git a/roles/common/tasks/aide.yml b/roles/common/tasks/aide.yml
index 2ed2774..919a3a7 100644
--- a/roles/common/tasks/aide.yml
+++ b/roles/common/tasks/aide.yml
@@ -1,5 +1,10 @@
 - name: Installation du HIDS AIDE
   yum: name=aide state=present
+  when: ansible_distribution == "CentOS"
+
+- name: Installation du HIDS AIDE
+  dnf: name=aide state=present
+  when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22
 
 - name: Activation Cron du HIDS AIDE
   copy: src=aidereport.sh dest=/etc/cron.daily/z-aidereport.sh mode=755
diff --git a/roles/common/tasks/cron.yml b/roles/common/tasks/cron.yml
index 53c0a9b..8dab3e2 100644
--- a/roles/common/tasks/cron.yml
+++ b/roles/common/tasks/cron.yml
@@ -1,10 +1,18 @@
+- name: Installation démon Cron
+  yum: name=crontabs state=present
+  when: ansible_distribution == "CentOS"
+
+- name: Installation démon Cron
+  dnf: name=crontabs state=present
+  when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22
+
 - name: Rapport disques durs
   template: src=diskreport.sh.j2 dest=/etc/cron.daily/diskreport.sh mode=755
   when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
 
 - name: Rapport SELinux
   copy: src=eaureport.sh dest=/etc/cron.daily/eaureport.sh mode=755
-  when: ansible_selinux != false
+  when: ansible_selinux.status != "disabled"
 
 - name: Rapport RPM Verify
   copy: src=rpmreport.sh dest=/etc/cron.daily/rpmreport.sh mode=755
@@ -12,7 +20,7 @@
 
 - name: Relabel système de fichier
   copy: src=selinuxresto.sh dest=/etc/cron.monthly/selinuxresto.sh mode=755
-  when: ansible_selinux != false
+  when: ansible_selinux.status != "disabled"
 
 - name: Tests disques durs
   template: src=diskcheck.sh.j2 dest=/etc/cron.weekly/diskcheck.sh mode=755
diff --git a/roles/common/tasks/logo.yml b/roles/common/tasks/logo.yml
index 2c3c169..5d08b63 100644
--- a/roles/common/tasks/logo.yml
+++ b/roles/common/tasks/logo.yml
@@ -1,8 +1,21 @@
 - name: Installation linux_logo Fedora
-  yum: name=http://fantom.fedorapeople.org/linux_logo-5.11-6.fc{{ logo_release }}.x86_64.rpm state=present
+  yum: name=https://fantom.fedorapeople.org/linux_logo-5.11-6.fc{{ ansible_distribution_version }}.x86_64.rpm state=present
+  when: ansible_distribution == "Fedora" and ansible_distribution_version|int <= 21
+
+- name: Installation linux_logo Fedora
+  dnf: name=https://fantom.fedorapeople.org/linux_logo-5.11-6.fc{{ logo_release }}.x86_64.rpm state=present
+  when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22
 
 - name: Ajout linux_logo en Exclude (yum)
   ini_file: dest=/etc/yum.conf
             section=main
             option=exclude
             value=linux_logo
+  when: ansible_distribution == "Fedora" and ansible_distribution_version|int <= 21
+
+- name: Ajout linux_logo en Exclude (dnf)
+  ini_file: dest=/etc/dnf/dnf.conf
+            section=main
+            option=exclude
+            value=linux_logo
+  when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 85fe1c3..bb7ac53 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -22,6 +22,9 @@
 - name: Configuration Yum
   include: yum.yml
 
+- name: Configuration DNF
+  include: dnf.yml
+
 - name: Installation linux_logo Fedora
   include: logo.yml
   when: ansible_distribution_version|int >= logo_release|int and ansible_architecture == "x86_64"
@@ -44,3 +47,6 @@
 
 - name: Changement de shell pour root
   include: zsh.yml
+
+- name: Activation de SELinux
+  include: selinux.yml
diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml
index 5c47967..e0870fa 100644
--- a/roles/common/tasks/pkgs.yml
+++ b/roles/common/tasks/pkgs.yml
@@ -21,9 +21,40 @@
     - at
     - zsh
     - libsemanage-python
+    - libselinux-python
+    - policycoreutils-python
+    - cryptsetup
+  when: ansible_distribution == "CentOS"
+
+- name: Installation des paquets
+  dnf: name={{ item }} state=present
+  with_items:
+    - emacs-nox
+    - iotop
+    - nmap
+    - screen
+    - powertop
+    - ipset
+    - patch
+    - gpm
+    - elinks
+    - vim-enhanced
+    - mutt
+    - nfs-utils
+    - tcpdump
+    - bind-utils
+    - tar
+    - at
+    - zsh
+    - libsemanage-python
+    - libselinux-python
+    - policycoreutils-python
+    - cryptsetup
+  when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22
+
 
 - name: Installation des paquets Fedora
-  yum: name={{ item }} state=present
+  dnf: name={{ item }} state=present
   with_items:
     - tmux
     - htop
@@ -42,11 +73,12 @@
     - scapy
     - testdisk
     - steghide
+    - yum-utils
     - docker
-  when: ansible_distribution == "Fedora"
+  when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22
 
 - name: Installation des paquets disgnostic matériel
-  yum: name={{ item }} state=present
+  dnf: name={{ item }} state=present
   with_items:
     - memtest86+
     - lm_sensors
@@ -54,5 +86,5 @@
   when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host"
 
 - name: Installation d'un programme de gravure
-  yum: name=wodim state=present
+  dnf: name=wodim state=present
   when: ansible_devices.sr0 is defined
diff --git a/roles/common/tasks/repos.yml b/roles/common/tasks/repos.yml
index 4009a08..51e2777 100644
--- a/roles/common/tasks/repos.yml
+++ b/roles/common/tasks/repos.yml
@@ -24,10 +24,10 @@
   when: ansible_distribution_version|int >= 22 and ansible_architecture == "x86_64"
         and ansible_distribution_release != "Rawhide"
 
-- name: Activation du miroir updates-testing
+- name: Désactivation du miroir updates-testing
   ini_file: dest=/etc/yum.repos.d/updates-testing-fantom.repo
             section=updates-testing-fantom
             option=enabled
-            value=1
+            value=0
   when: ansible_distribution_version|int >= 22 and ansible_architecture == "x86_64"
         and ansible_distribution_release != "Rawhide"
diff --git a/roles/common/tasks/rkhunter.yml b/roles/common/tasks/rkhunter.yml
index 1338f1c..318911d 100644
--- a/roles/common/tasks/rkhunter.yml
+++ b/roles/common/tasks/rkhunter.yml
@@ -1,5 +1,5 @@
 - name: Installation du HIDS rkhunter
-  yum: name=rkhunter state=present
+  dnf: name=rkhunter state=present
   notify: initialize rkhunter
 
 - name: Activation de tests rkhunter
diff --git a/roles/common/tasks/services.yml b/roles/common/tasks/services.yml
index d7e5cb8..12e621b 100644
--- a/roles/common/tasks/services.yml
+++ b/roles/common/tasks/services.yml
@@ -1,6 +1,6 @@
 - name: Activation et démarrage du service Console Mouse Manager
   service: name=gpm state=started enabled=yes
-  when: notty is not defined
+  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