Skip to content
Snippets Groups Projects
Commit c52cacea authored by Lars Beckers's avatar Lars Beckers
Browse files

fix ansible deprecation warnings

parent d9072f4e
No related branches found
No related tags found
No related merge requests found
...@@ -2,14 +2,13 @@ ...@@ -2,14 +2,13 @@
- name: ensure all required dovecot packages are installed - name: ensure all required dovecot packages are installed
apt: apt:
name: "{{ item }}" name:
state: present
with_items:
- dovecot-core - dovecot-core
- dovecot-imapd - dovecot-imapd
- dovecot-lmtpd - dovecot-lmtpd
- dovecot-managesieved - dovecot-managesieved
- dovecot-sieve - dovecot-sieve
state: present
tags: tags:
- dovecot - dovecot
- mail - mail
......
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
- name: ensure all required postfix packages are installed - name: ensure all required postfix packages are installed
apt: apt:
name: "{{ item }}" name:
state: present
with_items:
- postfix - postfix
- postfix-pcre - postfix-pcre
- postfix-cdb - postfix-cdb
state: present
tags: tags:
- postfix - postfix
- mail - mail
......
...@@ -2,36 +2,55 @@ ...@@ -2,36 +2,55 @@
- import_tasks: postgres.yml db_user="{{prosody_user}}" db_name="{{prosody_db}}" - import_tasks: postgres.yml db_user="{{prosody_user}}" db_name="{{prosody_db}}"
- name: ensure prosody is installed - name: ensure prosody is installed
apt: name={{ item }} state=present apt:
with_items: name:
- prosody - prosody
- prosody-modules - prosody-modules
state: present
tags: tags:
- prosody - prosody
- name: ensure minimal config that includes only conf.d is present - 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: tags:
- prosody - prosody
notify: restart prosody notify: restart prosody
- name: ensure templated config is present - 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 }}" with_items: "{{ prosody_config_files }}"
tags: tags:
- prosody - prosody
- name: ensure templated config is active - 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 }}" with_items: "{{ prosody_config_files }}"
tags: tags:
- prosody - prosody
notify: restart prosody notify: restart prosody
- name: ensure prosody is running and enables - name: ensure prosody is running and enables
service: name=prosody state=started enabled=yes service:
name: prosody
state: started
enabled: yes
tags: tags:
- prosody - prosody
- meta: flush_handlers - meta: flush_handlers
...@@ -2,11 +2,10 @@ ...@@ -2,11 +2,10 @@
- name: ensure spamassassin is installed - name: ensure spamassassin is installed
apt: apt:
name: "{{ item }}" name:
state: present
with_items:
- spamassassin - spamassassin
- spamc - spamc
state: present
tags: tags:
- mail - mail
- spamassassin - spamassassin
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment