add handlers, move shellscripts to /usr/local/bin

This commit is contained in:
psy 2021-02-10 12:01:33 +01:00
parent d8ace47eea
commit 420bcb1b98
No known key found for this signature in database
GPG key ID: DFF5B17AC3A8ECF5
4 changed files with 31 additions and 35 deletions

View file

@ -2,4 +2,4 @@ require ["vnd.dovecot.pipe", "copy", "imapsieve", "variables"];
if string "${mailbox}" "Trash" { if string "${mailbox}" "Trash" {
stop; stop;
} }
pipe :copy "rspamd-learn-ham.sh"; pipe :copy "/usr/local/bin/rspamd-learn-ham.sh";

View file

@ -1,2 +1,2 @@
require ["vnd.dovecot.pipe", "copy", "imapsieve"]; require ["vnd.dovecot.pipe", "copy", "imapsieve"];
pipe :copy "rspamd-learn-spam.sh"; pipe :copy "/usr/local/bin/rspamd-learn-spam.sh";

View file

@ -1,2 +1,12 @@
- name: restart rspamd - name: restart rspamd
service: name=rspamd state=restarted 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

View file

@ -17,13 +17,7 @@
sieve_pipe_bin_dir = /etc/dovecot/sieve sieve_pipe_bin_dir = /etc/dovecot/sieve
sieve_global_extensions = +vnd.dovecot.pipe sieve_global_extensions = +vnd.dovecot.pipe
sieve_plugins = sieve_imapsieve sieve_extprograms sieve_plugins = sieve_imapsieve sieve_extprograms
register: dovecot_config notify: restart dovecot
- name: restart dovecot
when: dovecot_config.changed
service:
name: dovecot
state: restarted
- name: create directory for sieve files - name: create directory for sieve files
file: file:
@ -34,39 +28,31 @@
copy: copy:
src: "{{ item }}" src: "{{ item }}"
dest: "/etc/dovecot/sieve/{{ item }}" dest: "/etc/dovecot/sieve/{{ item }}"
owner: vmail # owner: vmail
group: vmail # group: vmail
mode: 0500 # mode: 0500
# become: yes
# become_user: vmail
with_items: with_items:
- learn-spam.sieve - learn-spam.sieve
- learn-ham.sieve - learn-ham.sieve
register: sieve_scripts notify: run sieve compiler
- name: run sieve compiler #- name: chown sieve files
when: sieve_scripts.changed # file:
command: | # path: "/etc/dovecot/sieve/{{ item }}"
sievec /etc/dovecot/sieve/{{ item }} # owner: vmail
with_items: # group: vmail
- learn-spam.sieve # mode: 0500
- learn-ham.sieve # with_items:
# - learn-spam.svbin
- name: chown sieve files # - learn-ham.svbin
file:
path: "/etc/dovecot/sieve/{{ item }}"
owner: vmail
group: vmail
mode: 0500
with_items:
- learn-spam.svbin
- learn-ham.svbin
- name: copy shellscripts - name: copy shellscripts
copy: copy:
src: "{{ item }}" src: "{{ item }}"
dest: "/etc/dovecot/sieve/{{ item }}" dest: "/usr/local/bin/{{ item }}"
owner: vmail mode: a+x
group: vmail
mode: 0700
with_items: with_items:
- rspamd-learn-spam.sh - rspamd-learn-spam.sh
- rspamd-learn-ham.sh - rspamd-learn-ham.sh