1 files changed, 27 insertions, 7 deletions

diff --git a/roles/IMAP/tasks/spam.yml b/roles/IMAP/tasks/spam.yml
index 06624dd..d70ccc9 100644
--- a/roles/IMAP/tasks/spam.yml
+++ b/roles/IMAP/tasks/spam.yml
@@ -1,63 +1,83 @@
 - name: Install spamassassin
-  apt: pkg={{ item }}
-  with_items:
+  apt: pkg={{ packages }}
+  vars:
+    packages:
     # The following two lines are for the policy lookup (made by amavis)
     - libnet-ldap-perl
     - libauthen-sasl-perl
     - razor
     - spamassassin
     - spamc
     - libdbi-perl
     - re2c
     - libc6-dev
     - gcc
     - make
   notify:
     - Compile Spamassassin rules
     - Restart Amavis
 
 - name: Create a 'spamassassin' database
   mysql_db: name=spamassassin state=present
             encoding=latin1 collation=latin1_general_ci
   notify:
     - Copy SQL tables for spamassassin
     - Create SQL tables for spamassassin
 
 - meta: flush_handlers
 
+
 - name: Copy SpamAssassin's configuration
   copy: src=etc/{{ item }}
         dest=/etc/{{ item }}
         owner=root group=root
         mode=0644
   with_items:
-    - spamassassin/local.cf
     - spamassassin/v310.pre
     - spamassassin/v320.pre
+  register: r1
+  notify:
+    - Restart Amavis
+
+- name: Copy SpamAssassin's configuration (2)
+  template: src=etc/{{ item }}.j2
+            dest=/etc/{{ item }}
+            owner=root group=root
+            mode=0644
+  with_items:
+    - spamassassin/local.cf
+  register: r2
   notify:
     - Restart Amavis
 
 - name: Provision /etc/default/spamassassin
   lineinfile: dest=/etc/default/spamassassin
-              regexp='^(\s*#)?\s*{{ item.var }}='
-              "line={{ item.var }}={{ item.value }}"
+              regexp='^(\\s*#)?\\s*{{ item.var }}\\s*='
+              line='{{ item.var }}={{ item.value }}'
               owner=root group=root
               mode=0644
   with_items:
     - { var: ENABLED, value: 0 }
     - { var: CRON,    value: 1 }
 
 - name: Create a 'amavis' SQL user
   # This *must* be the user we run spamd as
   # See https://svn.apache.org/repos/asf/spamassassin/trunk/sql/README.bayes
-  mysql_user2: >
-      name=amavis password= auth_plugin=auth_socket
+  mysql_user: >
+      name=amavis password= plugin=auth_socket
       priv="spamassassin.awl:               SELECT,INSERT,UPDATE,DELETE
            /spamassassin.bayes_seen:        SELECT,INSERT,       DELETE
            /spamassassin.bayes_token:       SELECT,INSERT,UPDATE,DELETE
            /spamassassin.bayes_global_vars: SELECT
            /spamassassin.bayes_vars:        SELECT,INSERT,UPDATE,DELETE
            /spamassassin.bayes_expire:      SELECT,INSERT,       DELETE"
       state=present
+  register: r3
   notify:
     - Restart Amavis
+
+- name: Start Amavis
+  service: name=amavis state=started
+  when: not (r1.changed or r2.changed or r3.changed)
+
+- meta: flush_handlers