From d87fefa9d38e6b8c99eafa16ea75dc8c879c41df Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Thu, 14 May 2015 23:26:10 +0200
Subject: Upgrade amavis config to Jessie.

---
 roles/amavis/tasks/main.yml                         |  9 ++++++++-
 roles/amavis/templates/etc/amavis/conf.d/50-user.j2 | 10 +++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'roles/amavis')

diff --git a/roles/amavis/tasks/main.yml b/roles/amavis/tasks/main.yml
index da1f86a..a30772d 100644
--- a/roles/amavis/tasks/main.yml
+++ b/roles/amavis/tasks/main.yml
@@ -2,6 +2,7 @@
   apt: pkg={{ item }}
   with_items:
     - amavisd-new
+    - libnet-ldap-perl
     # Mail::DKIM
     - libmail-dkim-perl
     - gzip
@@ -25,11 +26,17 @@
 
 - name: Add 'clamav' to the group 'amavis'
   user: name=clamav groups=amavis append=yes
-  register: r1
   notify:
     - Restart ClamAV
     - Restart Amavis
 
+- name: Set AllowSupplementaryGroups=true
+  lineinfile: "dest=/etc/clamav/clamd.conf
+               regexp='^AllowSupplementaryGroups\\s'
+               line='AllowSupplementaryGroups true'"
+  notify:
+    - Restart ClamAV
+
 - name: Create directory /var/lib/dkim
   file: path=/var/lib/dkim
         state=directory
diff --git a/roles/amavis/templates/etc/amavis/conf.d/50-user.j2 b/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
index ae2031b..92805b8 100644
--- a/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
+++ b/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
@@ -156,7 +156,7 @@ $policy_bank{'OUTGOING'} = {
   quarantine_method_by_ccat  => { &CC_VIRUS => [$virus_quarantine_method], &CC_UNCHECKED => undef, &CC_CLEAN => undef       },
   admin_maps_by_ccat         => { &CC_VIRUS => ["postmaster\@$mydomain"],  &CC_UNCHECKED => undef                           },
   lovers_maps_by_ccat        => { &CC_VIRUS => undef,                      &CC_UNCHECKED => 1                               },
-  final_destiny_by_ccat      => { &CC_VIRUS => D_DISCARD,                  &CC_UNCHECKED => D_PASS, &CC_OVERSIZED => D_PASS },
+  final_destiny_maps_by_ccat => { &CC_VIRUS => D_DISCARD,                  &CC_UNCHECKED => D_PASS, &CC_OVERSIZED => D_PASS },
 };
 
 $policy_bank{'INCOMING'} = {
@@ -175,12 +175,12 @@ $policy_bank{'INCOMING'} = {
   # (Remember to disallow setting amavisSpamQuarantineCutoffLevel and
   # amavisVirusQuarantine*To in the LDAP schema.)
   # XXX: users might want to quarantine messages and get a notification instead
-  quarantine_method_by_ccat => { map {$_ => undef} (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM, CC_BADH, CC_CLEAN) },
-  admin_maps_by_ccat        => { map {$_ => undef} (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM, CC_BADH          ) },
+  quarantine_method_by_ccat  => { map {$_ => undef} (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM, CC_BADH, CC_CLEAN) },
+  admin_maps_by_ccat         => { map {$_ => undef} (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM, CC_BADH          ) },
 
   # Always deliver messages
-  final_destiny_by_ccat  => { map {$_ => D_PASS} (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM,            CC_BADH) },
-  lovers_maps_by_ccat    => { map {$_ => 1     } (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM, CC_SPAMMY, CC_BADH) },
+  final_destiny_maps_by_ccat => { map {$_ => D_PASS} (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM,            CC_BADH) },
+  lovers_maps_by_ccat        => { map {$_ => 1     } (CC_VIRUS, CC_BANNED, CC_UNCHECKED, CC_SPAM, CC_SPAMMY, CC_BADH) },
 };
 
 #------------ Do not modify anything below this line -------------
-- 
cgit v1.2.3