aboutsummaryrefslogtreecommitdiffstats
path: root/roles/mailserver
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@archive.org>2022-06-22 20:57:51 -0700
committerBryan Newbold <bnewbold@archive.org>2022-06-22 21:00:08 -0700
commit5d201f7d9b55ff50753da2456634a3e51462ba1f (patch)
tree073a983bb2162b71af6270bb9d454d0341bf7272 /roles/mailserver
parentb64c159c3df815c361a19884d63ceba59b709990 (diff)
downloadinfra-5d201f7d9b55ff50753da2456634a3e51462ba1f.tar.gz
infra-5d201f7d9b55ff50753da2456634a3e51462ba1f.zip
refactor 'apt' tasks to newer syntax (not 'with_items')
Diffstat (limited to 'roles/mailserver')
-rw-r--r--roles/mailserver/tasks/dovecot.yml14
-rw-r--r--roles/mailserver/tasks/postfix.yml13
-rw-r--r--roles/mailserver/tasks/rspamd.yml4
3 files changed, 16 insertions, 15 deletions
diff --git a/roles/mailserver/tasks/dovecot.yml b/roles/mailserver/tasks/dovecot.yml
index 9d2c20e..ca62b96 100644
--- a/roles/mailserver/tasks/dovecot.yml
+++ b/roles/mailserver/tasks/dovecot.yml
@@ -1,10 +1,12 @@
- name: Install Dovecot and related packages
- apt: pkg={{ item }} update_cache=yes state=installed
- with_items:
- - dovecot-core
- - dovecot-imapd
- - dovecot-lmtpd
- - dovecot-antispam
+ apt:
+ update_cache: yes
+ state: present
+ name:
+ - dovecot-core
+ - dovecot-imapd
+ - dovecot-lmtpd
+ - dovecot-antispam
tags:
- dependencies
diff --git a/roles/mailserver/tasks/postfix.yml b/roles/mailserver/tasks/postfix.yml
index a36acd6..7b02cf4 100644
--- a/roles/mailserver/tasks/postfix.yml
+++ b/roles/mailserver/tasks/postfix.yml
@@ -1,10 +1,11 @@
- name: Install Postfix and related packages
- apt: pkg={{ item }} state=installed
- with_items:
- - libsasl2-modules
- - postfix
- - postfix-pcre
- - sasl2-bin
+ apt:
+ state: present
+ name:
+ - libsasl2-modules
+ - postfix
+ - postfix-pcre
+ - sasl2-bin
tags:
- dependencies
diff --git a/roles/mailserver/tasks/rspamd.yml b/roles/mailserver/tasks/rspamd.yml
index 4d870a8..c00bf72 100644
--- a/roles/mailserver/tasks/rspamd.yml
+++ b/roles/mailserver/tasks/rspamd.yml
@@ -26,9 +26,7 @@
- dependencies
- name: Install Rspamd and Redis
- apt: pkg={{ item }} state=installed update_cache=yes
- with_items:
- - rspamd
+ apt: pkg=rspamd state=installed update_cache=yes
tags:
- dependencies