From cfedc9e785831d54195b120300932f74f9808daf Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Mon, 3 Dec 2018 03:21:42 +0100 Subject: Upgrade syntax to Ansible 2.7 (apt module). --- roles/common/tasks/apt.yml | 5 +++-- roles/common/tasks/clamav.yml | 5 +++-- roles/common/tasks/firewall.yml | 5 +++-- roles/common/tasks/ipsec.yml | 5 +++-- roles/common/tasks/logging.yml | 5 +++-- roles/common/tasks/mail.yml | 5 +++-- roles/common/tasks/main.yml | 5 +++-- roles/common/tasks/munin-node.yml | 5 +++-- roles/common/tasks/rkhunter.yml | 5 +++-- 9 files changed, 27 insertions(+), 18 deletions(-) (limited to 'roles/common/tasks') diff --git a/roles/common/tasks/apt.yml b/roles/common/tasks/apt.yml index 2f5a62a..8df3e8f 100644 --- a/roles/common/tasks/apt.yml +++ b/roles/common/tasks/apt.yml @@ -1,6 +1,7 @@ - name: Install various APT tools - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - apt - apt-listchanges - apt-show-versions diff --git a/roles/common/tasks/clamav.yml b/roles/common/tasks/clamav.yml index 28a8460..437387b 100644 --- a/roles/common/tasks/clamav.yml +++ b/roles/common/tasks/clamav.yml @@ -1,6 +1,7 @@ - name: Install ClamAV - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - clamav - clamav-daemon - clamav-freshclam diff --git a/roles/common/tasks/firewall.yml b/roles/common/tasks/firewall.yml index d418326..133b631 100644 --- a/roles/common/tasks/firewall.yml +++ b/roles/common/tasks/firewall.yml @@ -1,6 +1,7 @@ - name: Install some packages required for the firewall - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - iptables - netmask - bsdutils diff --git a/roles/common/tasks/ipsec.yml b/roles/common/tasks/ipsec.yml index ce158fe..989541b 100644 --- a/roles/common/tasks/ipsec.yml +++ b/roles/common/tasks/ipsec.yml @@ -1,6 +1,7 @@ - name: Install strongSwan - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - strongswan-charon # for the GCM and openssl plugins - libstrongswan-standard-plugins diff --git a/roles/common/tasks/logging.yml b/roles/common/tasks/logging.yml index b27fc41..b602a49 100644 --- a/roles/common/tasks/logging.yml +++ b/roles/common/tasks/logging.yml @@ -1,6 +1,7 @@ - name: Install logging server & utilities - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - rsyslog - syslog-summary - logcheck diff --git a/roles/common/tasks/mail.yml b/roles/common/tasks/mail.yml index 49815f5..139386f 100644 --- a/roles/common/tasks/mail.yml +++ b/roles/common/tasks/mail.yml @@ -1,6 +1,7 @@ - name: Install Postfix - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: # That one is nicer than GNU mailutils' mailx(1) - s-nail - postfix diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index c978e91..7795da8 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -69,8 +69,9 @@ - munin - name: Install common packages - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - ca-certificates - etckeeper - ethtool diff --git a/roles/common/tasks/munin-node.yml b/roles/common/tasks/munin-node.yml index d4f8d95..f43094a 100644 --- a/roles/common/tasks/munin-node.yml +++ b/roles/common/tasks/munin-node.yml @@ -1,6 +1,7 @@ - name: Install munin-node - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - munin-node - munin-plugins-extra ### diff --git a/roles/common/tasks/rkhunter.yml b/roles/common/tasks/rkhunter.yml index c9d26fa..64f2aac 100644 --- a/roles/common/tasks/rkhunter.yml +++ b/roles/common/tasks/rkhunter.yml @@ -1,6 +1,7 @@ - name: Install rkhunter - apt: pkg={{ item }} - with_items: + apt: pkg={{ packages }} + vars: + packages: - rkhunter - curl - iproute2 -- cgit v1.2.3