update mail - migrate from opendkim and opendmarc to rspamd

2021-01-17 03:18:43 +03:00
parent 2cd9fc4fd5
commit 814a48e3a7
6 changed files with 90 additions and 19 deletions
--- a/roles/mail/tasks/main.yaml
+++ b/roles/mail/tasks/main.yaml
@ -49,17 +49,19 @@
 - name: Deploy OpenDKIM
  import_role: 
    name: opendkim
+  when: opendkim_enabled | default(false)
  tags: opendkim

 - name: Deploy OpenDMARC
  import_role: 
    name: opendmarc
+  when: opendmarc_enabled | default(false)
  tags: opendmarc

 - name: Deploy Rspamd
  import_role: 
    name: rspamd
-  when: rspamd_enabled | default(false)
+  when: rspamd_enabled | default(true)
  tags: rspamd

 - name: Deploy Roundcube