From 420bcb1b9880a5cdaa6683bc2240d483fac491d2 Mon Sep 17 00:00:00 2001
From: psy <psy@darmstadt.ccc.de>
Date: Wed, 10 Feb 2021 12:01:33 +0100
Subject: [PATCH] add handlers, move shellscripts to /usr/local/bin

---
 files/learn-ham.sieve           |  2 +-
 files/learn-spam.sieve          |  2 +-
 handlers/main.yml               | 10 +++++++
 tasks/sieve_train_from_junk.yml | 52 ++++++++++++---------------------
 4 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/files/learn-ham.sieve b/files/learn-ham.sieve
index a9226ce..2fbb2a3 100644
--- a/files/learn-ham.sieve
+++ b/files/learn-ham.sieve
@@ -2,4 +2,4 @@ require ["vnd.dovecot.pipe", "copy", "imapsieve", "variables"];
 if string "${mailbox}" "Trash" {
   stop;
 }
-pipe :copy "rspamd-learn-ham.sh";
+pipe :copy "/usr/local/bin/rspamd-learn-ham.sh";
diff --git a/files/learn-spam.sieve b/files/learn-spam.sieve
index a5b6176..4df89be 100644
--- a/files/learn-spam.sieve
+++ b/files/learn-spam.sieve
@@ -1,2 +1,2 @@
 require ["vnd.dovecot.pipe", "copy", "imapsieve"];
-pipe :copy "rspamd-learn-spam.sh";
+pipe :copy "/usr/local/bin/rspamd-learn-spam.sh";
diff --git a/handlers/main.yml b/handlers/main.yml
index efcd370..43d2824 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,2 +1,12 @@
 - name: restart rspamd
   service: name=rspamd state=restarted
+- name: restart dovecot
+  service:
+    name: dovecot
+    state: restarted
+- name: run sieve compiler
+  command:
+    cmd: /usr/bin/sievec /etc/dovecot/sieve/
+    chdir: /etc/dovecot/sieve/
+#  become: yes
+#  become_user: vmail
diff --git a/tasks/sieve_train_from_junk.yml b/tasks/sieve_train_from_junk.yml
index 5336aac..4466eb4 100644
--- a/tasks/sieve_train_from_junk.yml
+++ b/tasks/sieve_train_from_junk.yml
@@ -17,13 +17,7 @@
       sieve_pipe_bin_dir = /etc/dovecot/sieve
       sieve_global_extensions = +vnd.dovecot.pipe
       sieve_plugins = sieve_imapsieve sieve_extprograms
-  register: dovecot_config
-
-- name: restart dovecot
-  when: dovecot_config.changed
-  service: 
-    name: dovecot 
-    state: restarted
+  notify: restart dovecot
 
 - name: create directory for sieve files
   file:
@@ -34,39 +28,31 @@
   copy:
     src: "{{ item }}"
     dest: "/etc/dovecot/sieve/{{ item }}"
-    owner: vmail
-    group: vmail
-    mode: 0500
+#    owner: vmail
+#    group: vmail
+#    mode: 0500
+#  become: yes
+#  become_user: vmail
   with_items:
     - learn-spam.sieve
     - learn-ham.sieve
-  register: sieve_scripts
+  notify: run sieve compiler
 
-- name: run sieve compiler
-  when: sieve_scripts.changed
-  command: |
-    sievec /etc/dovecot/sieve/{{ item }}
-  with_items:
-    - learn-spam.sieve
-    - learn-ham.sieve
-
-- name: chown sieve files
-  file:
-    path: "/etc/dovecot/sieve/{{ item }}"
-    owner: vmail
-    group: vmail
-    mode: 0500
-  with_items:
-    - learn-spam.svbin
-    - learn-ham.svbin
+#- name: chown sieve files
+#  file:
+#    path: "/etc/dovecot/sieve/{{ item }}"
+#    owner: vmail
+#    group: vmail
+#    mode: 0500
+#  with_items:
+#    - learn-spam.svbin
+#    - learn-ham.svbin
 
 - name: copy shellscripts
   copy:
     src: "{{ item }}"
-    dest: "/etc/dovecot/sieve/{{ item }}"
-    owner: vmail
-    group: vmail
-    mode: 0700
+    dest: "/usr/local/bin/{{ item }}"
+    mode: a+x
   with_items:
     - rspamd-learn-spam.sh
-    - rspamd-learn-ham.sh
\ No newline at end of file
+    - rspamd-learn-ham.sh