From 2d4b90bcd96f7e4bba4ac3d53d47925ad77b71bd Mon Sep 17 00:00:00 2001 From: Matthieu Saulnier Date: Tue, 25 Dec 2018 15:23:05 +0100 Subject: Replace yum and dnf modules with package module --- roles/bittorrent/tasks/pkgs.yml | 9 +++------ roles/clients/tasks/kde.yml | 12 +++++++----- roles/clients/tasks/pkgs.yml | 8 ++++++-- roles/clients/tasks/repos.yml | 8 ++++++-- roles/clients/tasks/xfce.yml | 8 ++++++-- roles/common/tasks/deps.yml | 30 ++++++++++++++++-------------- roles/common/tasks/pkgs.yml | 8 ++++++-- roles/common/tasks/repos.yml | 10 ++++------ roles/diagnostics/tasks/aide.yml | 9 +++------ roles/diagnostics/tasks/cron.yml | 9 +++------ roles/dnsserver/tasks/pkgs.yml | 9 +++------ roles/mtaserver/tasks/pkgs.yml | 16 +++------------- roles/ntpserver/tasks/pkgs.yml | 12 ++++++++---- roles/torrelay/tasks/pkgs.yml | 15 +++++++-------- 14 files changed, 81 insertions(+), 82 deletions(-) diff --git a/roles/bittorrent/tasks/pkgs.yml b/roles/bittorrent/tasks/pkgs.yml index f5b0f87..9862738 100644 --- a/roles/bittorrent/tasks/pkgs.yml +++ b/roles/bittorrent/tasks/pkgs.yml @@ -1,7 +1,4 @@ - name: Installation de transmission - yum: name=transmission-daemon state=present - when: ansible_pkg_mgr == "yum" - -- name: Installation de transmission - dnf: name=transmission-daemon state=present - when: ansible_pkg_mgr == "dnf" + package: + name: transmission-daemon + state: present diff --git a/roles/clients/tasks/kde.yml b/roles/clients/tasks/kde.yml index c94d8fb..853b48c 100644 --- a/roles/clients/tasks/kde.yml +++ b/roles/clients/tasks/kde.yml @@ -1,8 +1,10 @@ -- name: Installation du groupe de paquets KDE - dnf: name='@KDE Plasma Workspaces' state=present - -- name: Installation de KDM - dnf: name=kdm state=present +- name: Installation des paquets KDE + package: + name: "{{ item }}" + state: present + with_items: + - '@KDE Plasma Workspaces' + - kdm - name: Désactivation GDM service: diff --git a/roles/clients/tasks/pkgs.yml b/roles/clients/tasks/pkgs.yml index 744b3c5..6079282 100644 --- a/roles/clients/tasks/pkgs.yml +++ b/roles/clients/tasks/pkgs.yml @@ -1,5 +1,7 @@ - name: Installation des paquets de base - dnf: name={{ item }} state=present + package: + name: "{{ item }}" + state: present with_items: - irssi - fetchmail @@ -188,7 +190,9 @@ - cmospwd - name: Installation des paquets codecs - dnf: name={{ item }} state=present + package: + name: "{{ item }}" + state: present with_items: - gstreamer-ffmpeg - gstreamer-plugin-crystalhd diff --git a/roles/clients/tasks/repos.yml b/roles/clients/tasks/repos.yml index f068414..1295a18 100644 --- a/roles/clients/tasks/repos.yml +++ b/roles/clients/tasks/repos.yml @@ -1,11 +1,15 @@ - name: Installation des dépôts RPMFusion - dnf: name={{ item }} state=present + package: + name: "{{ item }}" + state: present with_items: - http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_version }}.noarch.rpm - http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_version }}.noarch.rpm - name: Mise à jour des dépôts RPMFusion - dnf: name={{ item }} state=latest + package: + name: "{{ item }}" + state: latest with_items: - rpmfusion-free-release - rpmfusion-nonfree-release diff --git a/roles/clients/tasks/xfce.yml b/roles/clients/tasks/xfce.yml index 62dec29..27342e2 100644 --- a/roles/clients/tasks/xfce.yml +++ b/roles/clients/tasks/xfce.yml @@ -1,5 +1,9 @@ - name: Installation du groupe de paquets XFCE - dnf: name='@Bureau Xfce' state=present + package: + name: '@Bureau Xfce' + state: present - name: Installation du screensaver - dnf: name=xscreensaver state=present + package: + name: xscreensaver + state: present diff --git a/roles/common/tasks/deps.yml b/roles/common/tasks/deps.yml index f7ac9de..bf444a3 100644 --- a/roles/common/tasks/deps.yml +++ b/roles/common/tasks/deps.yml @@ -1,21 +1,23 @@ - name: Installation des dépendances du playbook - dnf: name={{ item }} state=present - with_items: - - libselinux-python - - python-dnf + package: + name: python-dnf + state: present 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 + package: + name: python-firewall + state: present + when: ansible_distribution == "Fedora" and ansible_distribution_version|int <= 27 + or ansible_distribution == "CentOS" - name: Installation du module firewall pour python3 - dnf: name=python3-firewall state=present - when: ansible_pkg_mgr == "dnf" and ansible_distribution_version|int >= 28 + package: + name: python3-firewall + state: present + when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 28 -- name: Installation des dépendances du playbook - yum: name={{ item }} state=present - with_items: - - libselinux-python - - python-firewall - when: ansible_pkg_mgr == "yum" +- name: Installation du module SELinux pour python + package: + name: libselinux-python + state: present diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml index 280df44..40b1ffb 100644 --- a/roles/common/tasks/pkgs.yml +++ b/roles/common/tasks/pkgs.yml @@ -1,5 +1,7 @@ - name: Installation des paquets pour Centos - yum: name={{ item }} state=present + package: + name: "{{ item }}" + state: present with_items: - yum-plugin-fastestmirror - yum-plugin-verify @@ -48,7 +50,9 @@ - whois - name: Installation des paquets pour Fedora - dnf: name={{ item }} state=present + package: + name: "{{ item }}" + state: present with_items: - bvi - mined diff --git a/roles/common/tasks/repos.yml b/roles/common/tasks/repos.yml index 650edec..a7dcb49 100644 --- a/roles/common/tasks/repos.yml +++ b/roles/common/tasks/repos.yml @@ -91,9 +91,7 @@ - name: Installation du dépôt EPEL pour Centos - yum: name=epel-release state=present - when: ansible_distribution == "CentOS" and ansible_pkg_mgr == "yum" - -- name: Installation du dépôt EPEL pour Centos - dnf: name=epel-release state=present - when: ansible_distribution == "CentOS" and ansible_pkg_mgr == "dnf" + package: + name: epel-release + state: present + when: ansible_distribution == "CentOS" diff --git a/roles/diagnostics/tasks/aide.yml b/roles/diagnostics/tasks/aide.yml index 72fc4b1..6652be7 100644 --- a/roles/diagnostics/tasks/aide.yml +++ b/roles/diagnostics/tasks/aide.yml @@ -1,10 +1,7 @@ - name: Installation du HIDS AIDE - yum: name=aide state=present - when: ansible_pkg_mgr == "yum" - -- name: Installation du HIDS AIDE - dnf: name=aide state=present - when: ansible_pkg_mgr == "dnf" + package: + name: aide + state: present - name: Activation Cron du HIDS AIDE copy: diff --git a/roles/diagnostics/tasks/cron.yml b/roles/diagnostics/tasks/cron.yml index 31ab4b2..cddaac2 100644 --- a/roles/diagnostics/tasks/cron.yml +++ b/roles/diagnostics/tasks/cron.yml @@ -1,10 +1,7 @@ - name: Installation démon Cron - yum: name=crontabs state=present - when: ansible_pkg_mgr == "yum" - -- name: Installation démon Cron - dnf: name=crontabs state=present - when: ansible_pkg_mgr == "dnf" + package: + name: crontabs + state: present - name: Rapport disques durs template: diff --git a/roles/dnsserver/tasks/pkgs.yml b/roles/dnsserver/tasks/pkgs.yml index 256b8d7..ce0800b 100644 --- a/roles/dnsserver/tasks/pkgs.yml +++ b/roles/dnsserver/tasks/pkgs.yml @@ -1,7 +1,4 @@ - name: Installation de bind - yum: name=bind state=present - when: ansible_pkg_mgr == "yum" - -- name: Installation de bind - dnf: name=bind state=present - when: ansible_pkg_mgr == "dnf" + package: + name: bind + state: present diff --git a/roles/mtaserver/tasks/pkgs.yml b/roles/mtaserver/tasks/pkgs.yml index 52972a5..d9f6263 100644 --- a/roles/mtaserver/tasks/pkgs.yml +++ b/roles/mtaserver/tasks/pkgs.yml @@ -1,20 +1,10 @@ - name: Installation des paquets - yum: name={{ item }} state=present + package: + name: "{{ item }}" + state: present with_items: - postfix - cyrus-sasl - cyrus-sasl-plain - pypolicyd-spf - opendkim - when: ansible_pkg_mgr == "yum" - -- name: Installation des paquets - dnf: name={{ item }} state=present - with_items: - - postfix - - cyrus-sasl - - cyrus-sasl-plain - - pypolicyd-spf - - opendkim - when: ansible_pkg_mgr == "dnf" - diff --git a/roles/ntpserver/tasks/pkgs.yml b/roles/ntpserver/tasks/pkgs.yml index 27e5424..baa3881 100644 --- a/roles/ntpserver/tasks/pkgs.yml +++ b/roles/ntpserver/tasks/pkgs.yml @@ -1,7 +1,11 @@ - name: Installation du paquet NTP - yum: name=ntp state=present - when: ansible_pkg_mgr == "yum" + package: + name: ntp + state: present + when: ansible_distribution == "CentOS" - name: Installation du paquet Chrony - dnf: name=chrony state=present - when: ansible_pkg_mgr == "dnf" + package: + name: chrony + state: present + when: ansible_distribution == "Fedora" diff --git a/roles/torrelay/tasks/pkgs.yml b/roles/torrelay/tasks/pkgs.yml index 5a54ecd..95d6c1a 100644 --- a/roles/torrelay/tasks/pkgs.yml +++ b/roles/torrelay/tasks/pkgs.yml @@ -1,14 +1,13 @@ - name: Installation du paquet Tor depuis le dépôt - yum: name=tor state=present - when: ansible_pkg_mgr == "yum" - -- name: Installation du paquet Tor depuis le dépôt - dnf: name=tor state=present - when: ansible_pkg_mgr == "dnf" + package: + name: tor + state: present - name: Installation de paquets optionnels depuis le dépôt - dnf: name={{ item }} state=present + package: + name: "{{ item }}" + state: present with_items: - tor-arm - proxychains - when: ansible_distribution == "Fedora" and ansible_pkg_mgr == "dnf" + when: ansible_distribution == "Fedora" -- cgit