Commit c52cacea authored by Lars Beckers's avatar Lars Beckers

fix ansible deprecation warnings

parent d9072f4e
......@@ -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
......
......@@ -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
......
......@@ -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
......@@ -2,11 +2,10 @@
- name: ensure spamassassin is installed
apt:
name: "{{ item }}"
name:
- spamassassin
- spamc
state: present
with_items:
- spamassassin
- spamc
tags:
- mail
- spamassassin
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment