cleanup duplicat code

Signed-off-by: Furragen <git@axk.io>
dev-sec · Oct 5, 2019 · c1d0f6b · c1d0f6b
1 parent b15fae1
commit c1d0f6b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 25 deletions.
diff --git a/tasks/selinux.yml b/tasks/selinux.yml
@@ -1,31 +1,8 @@
 ---
-- name: install selinux dependencies when selinux is installed on RHEL or Oracle Linux 7
+- name: install selinux dependencies when selinux is installed
   package:
-    name: '{{ item }}'
+    name: '{{ ssh_selinux_packages }}'
     state: present
-  with_items:
-    - 'policycoreutils-python'
-    - 'checkpolicy'
-  when:
-    - ansible_os_family == 'RedHat' or ansible_os_family == 'Oracle Linux'
-    - ansible_distribution_major_version <= "7"
-    - ansible_distribution != 'Fedora'
-
-- name: install selinux dependencies when selinux is installed on RHEL or Oracle Linux 8
-  package:
-    name: '{{ item }}'
-    state: present
-  with_items:
-    - 'python3-policycoreutils'
-    - 'checkpolicy'
-  when:
-    - (ansible_os_family == 'RedHat' or ansible_os_family == 'Oracle Linux' and ansible_distribution_major_version >= "8") or ansible_distribution == 'Fedora'
-
-- name: install selinux dependencies when selinux is installed on Debian or Ubuntu
-  apt:
-    name: ['policycoreutils', 'checkpolicy']
-    state: present
-  when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
 
 - name: "authorize {{ ssh_server_ports }} ports for selinux"
   seport:

diff --git a/vars/Debian.yml b/vars/Debian.yml
@@ -1,3 +1,6 @@
 sshd_service_name: ssh
 ssh_owner: root
 ssh_group: root
+ssh_selinux_packages:
+  - policycoreutils-python
+  - checkpolicy
diff --git a/vars/Fedora.yml b/vars/Fedora.yml
@@ -0,0 +1,6 @@
+sshd_service_name: sshd
+ssh_owner: root
+ssh_group: root
+ssh_selinux_packages:
+  - python3-policycoreutils
+  - checkpolicy
diff --git a/vars/Oracle Linux.yml b/vars/Oracle Linux.yml
@@ -1,3 +1,6 @@
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: root
+ssh_selinux_packages:
+  - policycoreutils-python
+  - checkpolicy
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -1,3 +1,6 @@
 sshd_service_name: sshd
 ssh_owner: root
 ssh_group: root
+ssh_selinux_packages:
+  - policycoreutils-python
+  - checkpolicy
diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml
@@ -0,0 +1,6 @@
+sshd_service_name: sshd
+ssh_owner: root
+ssh_group: root
+ssh_selinux_packages:
+  - python3-policycoreutils
+  - checkpolicy