diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-09-15 21:19:15 +0200 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-09-15 21:19:15 +0200 |
| commit | 93421493605c36690fbef1713f4d987b18ec3f46 (patch) | |
| tree | 52aa2e324ec78669f6adb524d8702e6ee49774e1 | |
| parent | e891ba9ad5335008ad1507d483f683b5d66bf679 (diff) | |
| download | playbooks-ansible-93421493605c36690fbef1713f4d987b18ec3f46.tar.gz playbooks-ansible-93421493605c36690fbef1713f4d987b18ec3f46.tar.xz playbooks-ansible-93421493605c36690fbef1713f4d987b18ec3f46.zip | |
Compat for fc28 and arm32v7 arch
| -rw-r--r-- | roles/common/tasks/deps.yml | 9 | ||||
| -rw-r--r-- | roles/common/tasks/pkgs.yml | 12 | ||||
| -rw-r--r-- | roles/common/tasks/services.yml | 3 | ||||
| -rw-r--r-- | roles/mtaserver/templates/main.cf.j2 | 4 |
4 files changed, 24 insertions, 4 deletions
diff --git a/roles/common/tasks/deps.yml b/roles/common/tasks/deps.yml index cefac63..905bd13 100644 --- a/roles/common/tasks/deps.yml +++ b/roles/common/tasks/deps.yml @@ -3,9 +3,16 @@ with_items: - libselinux-python - python-dnf - - python-firewall when: ansible_pkg_mgr == "dnf" +- name: Installation du module firewall pour python2 + dnf: name=python-firewall state=present + when: ansible_pkg_mgr == "dnf" and ansible_distribution_version|int <= 27 + +- name: Installation du module firewall pour python3 + dnf: name=python3-firewall state=present + when: ansible_pkg_mgr == "dnf" and ansible_distribution_version|int >= 28 + - name: Installation des dépendances du playbook yum: name={{ item }} state=present with_items: diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml index 1268953..17bf5d9 100644 --- a/roles/common/tasks/pkgs.yml +++ b/roles/common/tasks/pkgs.yml @@ -61,12 +61,20 @@ - name: Installation des paquets disgnostic matériel dnf: name={{ item }} state=present with_items: - - memtest86+ - - lm_sensors - hddtemp - smartmontools when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" +- name: Installation du paquet memtest pour archi x86_64 + dnf: name=memtest86+ state=present + when: ansible_architecture == "x86_64" and + ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" + +- name: Installation du paquet lm_sensors pour archi x86_64 + dnf: name=lm_sensors state=present + when: ansible_architecture == "x86_64" and + ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" + - name: Installation d'un programme de gravure dnf: name=wodim state=present when: ansible_devices.sr0 is defined diff --git a/roles/common/tasks/services.yml b/roles/common/tasks/services.yml index a057b9d..0f7343b 100644 --- a/roles/common/tasks/services.yml +++ b/roles/common/tasks/services.yml @@ -4,7 +4,8 @@ - name: Activation et démarrage du service lm_sensors service: name=lm_sensors state=started enabled=yes - when: ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" + when: ansible_architecture == "x86_64" and + ansible_virtualization_role == "NA" or ansible_virtualization_role == "host" - name: Activation et démarrage du service Smartd service: name=smartd state=started enabled=yes diff --git a/roles/mtaserver/templates/main.cf.j2 b/roles/mtaserver/templates/main.cf.j2 index 9a60e01..b3ed7ba 100644 --- a/roles/mtaserver/templates/main.cf.j2 +++ b/roles/mtaserver/templates/main.cf.j2 @@ -796,4 +796,8 @@ policyd-spf_time_limit = 3600 {% endif %} meta_directory = /etc/postfix +{% if ansible_architecture == "x86_64" %} shlib_directory = /usr/lib64/postfix +{% else %} +shlib_directory = /usr/lib/postfix +{% endif %} |