summaryrefslogtreecommitdiffstats
path: root/roles/common
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2018-12-03 03:21:42 +0100
committerGuilhem Moulin <guilhem@fripost.org>2018-12-03 03:43:42 +0100
commitcfedc9e785831d54195b120300932f74f9808daf (patch)
tree3f906311a6d2a7340b9d9012f23c07c95e8015b2 /roles/common
parentf01876604da167b36780e53ce54cd89c8f9d5f85 (diff)
Upgrade syntax to Ansible 2.7 (apt module).
Diffstat (limited to 'roles/common')
-rw-r--r--roles/common/tasks/apt.yml5
-rw-r--r--roles/common/tasks/clamav.yml5
-rw-r--r--roles/common/tasks/firewall.yml5
-rw-r--r--roles/common/tasks/ipsec.yml5
-rw-r--r--roles/common/tasks/logging.yml5
-rw-r--r--roles/common/tasks/mail.yml5
-rw-r--r--roles/common/tasks/main.yml5
-rw-r--r--roles/common/tasks/munin-node.yml5
-rw-r--r--roles/common/tasks/rkhunter.yml5
9 files changed, 27 insertions, 18 deletions
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