summaryrefslogtreecommitdiffstats
path: root/roles/IMAP/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'roles/IMAP/tasks')
-rw-r--r--roles/IMAP/tasks/amavis.yml56
-rw-r--r--roles/IMAP/tasks/main.yml1
-rw-r--r--roles/IMAP/tasks/spam.yml3
3 files changed, 3 insertions, 57 deletions
diff --git a/roles/IMAP/tasks/amavis.yml b/roles/IMAP/tasks/amavis.yml
deleted file mode 100644
index 6f47328..0000000
--- a/roles/IMAP/tasks/amavis.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-- name: Install amavis and its decoders
- apt: pkg={{ item }}
- with_items:
- - amavisd-new
- - libnet-ldap-perl
- - libauthen-sasl-perl
- - gzip
- - bzip2
- - xz-utils
- - lzop
- - rpm2cpio
- - pax
- - binutils
- - p7zip-full
- - unrar-free
- - arj
- - nomarch
- - zoo
- - ripole
- - cabextract
- - unar
- - tnef
- notify:
- - Restart Amavis
-
-- name: Add 'clamav' to the group 'amavis'
- user: name=clamav groups=amavis append=yes
- register: r1
- notify:
- - Restart ClamAV
- - Restart Amavis
-
-- name: Configure Amavis (1)
- copy: src=etc/amavis/conf.d/05-domain_id
- dest=/etc/amavis/conf.d/05-domain_id
- owner=root group=root
- mode=0644
- register: r2
- notify:
- - Restart Amavis
-
-- name: Configure Amavis (2)
- template: src=etc/amavis/conf.d/{{ item }}.j2
- dest=/etc/amavis/conf.d/{{ item }}
- owner=root group=root
- mode=0644
- register: r3
- with_items:
- - 15-content_filter_mode
- - 50-user
- notify:
- - Restart Amavis
-
-- name: Start Amavis
- service: name=amavis state=started
- when: not (r1.changed or r2.changed or r3.changed)
diff --git a/roles/IMAP/tasks/main.yml b/roles/IMAP/tasks/main.yml
index b43f9fb..c6fbbd9 100644
--- a/roles/IMAP/tasks/main.yml
+++ b/roles/IMAP/tasks/main.yml
@@ -1,5 +1,4 @@
---
- include: imap.yml tags=imap,dovecot
- include: mda.yml tags=mda,mail,postfix
-- include: amavis.yml tags=amavis
- include: spam.yml tags=spam,spamassassin
diff --git a/roles/IMAP/tasks/spam.yml b/roles/IMAP/tasks/spam.yml
index 51fde4b..a8fbe71 100644
--- a/roles/IMAP/tasks/spam.yml
+++ b/roles/IMAP/tasks/spam.yml
@@ -1,6 +1,9 @@
- name: Install spamassassin
apt: pkg={{ item }}
with_items:
+ # The following two lines are for the policy lookup (made by amavis)
+ - libnet-ldap-perl
+ - libauthen-sasl-perl
- razor
- spamassassin
- spamc