From b38b344ce59230c5942ebfdf9ab05a243219b0f0 Mon Sep 17 00:00:00 2001
From: Matthieu Saulnier <fantom@fedoraproject.org>
Date: Sat, 24 Nov 2018 16:09:14 +0100
Subject: Fix filename for semodule files in selinux tasks (torrelay role)

---
 roles/torrelay/tasks/selinux.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/torrelay/tasks/selinux.yml b/roles/torrelay/tasks/selinux.yml
index 57e88bd..58e04f7 100644
--- a/roles/torrelay/tasks/selinux.yml
+++ b/roles/torrelay/tasks/selinux.yml
@@ -18,22 +18,22 @@
 
 - name: Installation des modules SELinux pour Centos
   copy:
-    src: "{{ item }}-7.5.pp"
-    dest: "/root/{{ item }}-7.5.pp"
+    src: "{{ item }}-centos-7.5.pp"
+    dest: "/root/{{ item }}.pp"
     mode: 0644
   with_items:
-    - tor-bind-pop_port-centos
-    - tor-dac-capabilities-centos
-  when: ansible_distribution == "CentOS" and ansible_distribution_version|int >= 7.5.1804
+    - tor-bind-pop_port
+    - tor-dac-capabilities
+  when: ansible_distribution == "CentOS" and ansible_distribution_major_version|int >= 7
 
 - name: Installation des modules SELinux pour Fedora
   copy:
-    src: "{{ item }}-{{ ansible_distribution_version }}.pp"
-    dest: "/root/{{ item }}-{{ ansible_distribution_version }}.pp"
+    src: "{{ item }}-fedora-{{ ansible_distribution_version }}.pp"
+    dest: "/root/{{ item }}.pp"
     mode: 0644
   with_items:
-    - tor-bind-pop_port-fedora
-    - tor-dac-capabilities-fedora
+    - tor-bind-pop_port
+    - tor-dac-capabilities
   when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 27
 
 - name: Vérification des modules
@@ -47,7 +47,7 @@
   ignore_errors: yes
 
 - name: Installation des modules
-  command: semodule -i /root/'{{ item }}'
+  command: semodule -i /root/'{{ item }}'.pp
   with_items:
     - tor-bind-pop_port
     - tor-dac-capabilities
-- 
cgit