summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Saulnier <fantom@fedoraproject.org>2018-11-24 16:09:14 +0100
committerMatthieu Saulnier <fantom@fedoraproject.org>2018-11-24 16:09:14 +0100
commitb38b344ce59230c5942ebfdf9ab05a243219b0f0 (patch)
tree7a2fd08fb1211b360c2d4138a9c888be5acfe2fa
parent6d1e936e25bcd5ed28bf12f010427581011f19a7 (diff)
downloadplaybooks-ansible-b38b344ce59230c5942ebfdf9ab05a243219b0f0.tar.gz
playbooks-ansible-b38b344ce59230c5942ebfdf9ab05a243219b0f0.tar.xz
playbooks-ansible-b38b344ce59230c5942ebfdf9ab05a243219b0f0.zip
Fix filename for semodule files in selinux tasks (torrelay role)
-rw-r--r--roles/torrelay/tasks/selinux.yml20
1 files 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