summaryrefslogtreecommitdiffstats
path: root/roles/common/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'roles/common/tasks')
-rw-r--r--roles/common/tasks/cron.yml4
-rw-r--r--roles/common/tasks/logo.yml1
-rw-r--r--roles/common/tasks/main.yml2
3 files changed, 3 insertions, 4 deletions
diff --git a/roles/common/tasks/cron.yml b/roles/common/tasks/cron.yml
index 3434c75..6169b0c 100644
--- a/roles/common/tasks/cron.yml
+++ b/roles/common/tasks/cron.yml
@@ -4,7 +4,7 @@
- name: Rapport SELinux
copy: src=eaureport.sh dest=/etc/cron.daily/eaureport.sh mode=755
- when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host"
+ when: ansible_selinux != false
- name: Rapport RPM Verify
copy: src=rpmreport.sh dest=/etc/cron.daily/rpmreport.sh mode=755
@@ -12,7 +12,7 @@
- name: Relabel système de fichier
copy: src=selinuxresto.sh dest=/etc/cron.monthly/selinuxresto.sh mode=755
- when: ansible_virtualization_role is not defined or ansible_virtualization_role == "host"
+ when: ansible_selinux != false
- 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 8b3647e..dfdfa46 100644
--- a/roles/common/tasks/logo.yml
+++ b/roles/common/tasks/logo.yml
@@ -1,6 +1,5 @@
- name: Installation linux_logo Fedora
yum: name=http://fantom.fedorapeople.org/linux_logo-5.11-6.fc20.x86_64.rpm state=present
- when: ansible_distribution_version|int == 20 and ansible_architecture == "x86_64"
- name: Ajout linux_logo en Exclude (yum)
ini_file: dest=/etc/yum.conf
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 13f2e12..8ceaf5a 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -21,7 +21,7 @@
- name: Installation linux_logo Fedora
include: logo.yml
- when: ansible_distribution == "Fedora"
+ when: ansible_distribution_version|int == 20 and ansible_architecture == "x86_64"
- name: Mise à jour et dépôt de mise à jour
include: update.yml