From c52cacea3529bd061a1cbbb0ec33c8329197fb6c Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Wed, 12 Dec 2018 15:37:14 +0100
Subject: [PATCH] fix ansible deprecation warnings
---
dovecot/tasks/main.yml | 13 ++++++-------
postfix/tasks/main.yml | 9 ++++-----
prosody/tasks/main.yml | 37 ++++++++++++++++++++++++++++---------
spamassassin/tasks/main.yml | 7 +++----
4 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/dovecot/tasks/main.yml b/dovecot/tasks/main.yml
index 8418a8d..c671fcc 100644
--- a/dovecot/tasks/main.yml
+++ b/dovecot/tasks/main.yml
@@ -2,14 +2,13 @@
- name: ensure all required dovecot packages are installed
apt:
- name: "{{ item }}"
+ name:
+ - dovecot-core
+ - dovecot-imapd
+ - dovecot-lmtpd
+ - dovecot-managesieved
+ - dovecot-sieve
state: present
- with_items:
- - dovecot-core
- - dovecot-imapd
- - dovecot-lmtpd
- - dovecot-managesieved
- - dovecot-sieve
tags:
- dovecot
- mail
diff --git a/postfix/tasks/main.yml b/postfix/tasks/main.yml
index 17df26b..29105b6 100644
--- a/postfix/tasks/main.yml
+++ b/postfix/tasks/main.yml
@@ -2,12 +2,11 @@
- name: ensure all required postfix packages are installed
apt:
- name: "{{ item }}"
+ name:
+ - postfix
+ - postfix-pcre
+ - postfix-cdb
state: present
- with_items:
- - postfix
- - postfix-pcre
- - postfix-cdb
tags:
- postfix
- mail
diff --git a/prosody/tasks/main.yml b/prosody/tasks/main.yml
index 5d2c50b..a6110a9 100644
--- a/prosody/tasks/main.yml
+++ b/prosody/tasks/main.yml
@@ -2,36 +2,55 @@
- import_tasks: postgres.yml db_user="{{prosody_user}}" db_name="{{prosody_db}}"
- name: ensure prosody is installed
- apt: name={{ item }} state=present
- with_items:
- - prosody
- - prosody-modules
+ apt:
+ name:
+ - prosody
+ - prosody-modules
+ state: present
tags:
- prosody
- name: ensure minimal config that includes only conf.d is present
- copy: src=files/prosody.cfg.lua dest=/etc/prosody/cfg.lua mode=0640 owner=root group=prosody
+ copy:
+ src: prosody.cfg.lua
+ dest: /etc/prosody/cfg.lua
+ mode: '0640'
+ owner: root
+ group: prosody
tags:
- prosody
notify: restart prosody
- name: ensure templated config is present
- template: src=templates/{{ item }}.cfg.lua.j2 dest=/etc/prosody/conf.avail/{{ item }}.cfg.lua mode=0640 owner=root group=prosody
+ template:
+ src: "{{ item }}.cfg.lua.j2"
+ dest: "/etc/prosody/conf.avail/{{ item }}.cfg.lua"
+ mode: '0640'
+ owner: root
+ group: prosody
with_items: "{{ prosody_config_files }}"
tags:
- prosody
- name: ensure templated config is active
- file: src=/etc/prosody/conf.avail/{{ item }}.cfg.lua path=/etc/prosody/conf.d/{{ item }}.cfg.lua state=link mode=0640 owner=root group=prosody
+ file:
+ src: "/etc/prosody/conf.avail/{{ item }}.cfg.lua"
+ path: "/etc/prosody/conf.d/{{ item }}.cfg.lua"
+ state: link
+ mode: '0640'
+ owner: root
+ group: prosody
with_items: "{{ prosody_config_files }}"
tags:
- prosody
notify: restart prosody
- name: ensure prosody is running and enables
- service: name=prosody state=started enabled=yes
+ service:
+ name: prosody
+ state: started
+ enabled: yes
tags:
- prosody
-
- meta: flush_handlers
diff --git a/spamassassin/tasks/main.yml b/spamassassin/tasks/main.yml
index 7ed4bf9..22be411 100644
--- a/spamassassin/tasks/main.yml
+++ b/spamassassin/tasks/main.yml
@@ -2,11 +2,10 @@
- name: ensure spamassassin is installed
apt:
- name: "{{ item }}"
+ name:
+ - spamassassin
+ - spamc
state: present
- with_items:
- - spamassassin
- - spamc
tags:
- mail
- spamassassin
--
GitLab