summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Saulnier <fantom@fedoraproject.org>2018-11-02 09:32:18 +0100
committerMatthieu Saulnier <fantom@fedoraproject.org>2018-11-02 09:32:18 +0100
commitc8a7c60e4fc651317cbd84a103baffb956200c29 (patch)
tree623575ceed93c46d4fb89d37bb8b75b5bd898c9b
parent0ed3af997381206f7a670ceaf24669de35d8670b (diff)
downloadplaybooks-ansible-c8a7c60e4fc651317cbd84a103baffb956200c29.tar.gz
playbooks-ansible-c8a7c60e4fc651317cbd84a103baffb956200c29.tar.xz
playbooks-ansible-c8a7c60e4fc651317cbd84a103baffb956200c29.zip
Move autorelabel task into diagnostic role
-rw-r--r--roles/common/tasks/main.yml3
-rw-r--r--roles/common/tasks/selinux.yml6
-rwxr-xr-xroles/diagnostics/files/selinuxresto.sh (renamed from roles/common/files/selinuxresto.sh)0
-rw-r--r--roles/diagnostics/tasks/selinux.yml7
4 files changed, 7 insertions, 9 deletions
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 4c3d00a..48e6964 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -47,6 +47,3 @@
- name: Changement de shell pour root
import_tasks: zsh.yml
-
-- name: Crontasks pour SELinux
- import_tasks: selinux.yml
diff --git a/roles/common/tasks/selinux.yml b/roles/common/tasks/selinux.yml
deleted file mode 100644
index 7f6fb2f..0000000
--- a/roles/common/tasks/selinux.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-- name: Relabel système de fichier
- copy:
- src: selinuxresto.sh
- dest: /etc/cron.monthly/selinuxresto.sh
- mode: 0755
- when: ansible_selinux.status != "disabled"
diff --git a/roles/common/files/selinuxresto.sh b/roles/diagnostics/files/selinuxresto.sh
index 22ff769..22ff769 100755
--- a/roles/common/files/selinuxresto.sh
+++ b/roles/diagnostics/files/selinuxresto.sh
diff --git a/roles/diagnostics/tasks/selinux.yml b/roles/diagnostics/tasks/selinux.yml
index 0acf948..92268e7 100644
--- a/roles/diagnostics/tasks/selinux.yml
+++ b/roles/diagnostics/tasks/selinux.yml
@@ -4,3 +4,10 @@
dest: /etc/cron.daily/eaureport.sh
mode: 0755
when: ansible_selinux.status != "disabled"
+
+- name: Relabel système de fichier
+ copy:
+ src: selinuxresto.sh
+ dest: /etc/cron.monthly/selinuxresto.sh
+ mode: 0755
+ when: ansible_selinux.status != "disabled"