diff --git a/roles/mailserver_dkim/handlers/main.yml b/roles/mailserver_dkim/handlers/main.yml index 7423418..0b29cbe 100644 --- a/roles/mailserver_dkim/handlers/main.yml +++ b/roles/mailserver_dkim/handlers/main.yml @@ -9,6 +9,17 @@ group: root mode: "640" +- name: Add selector to DKIM selectors map + become: true + ansible.builtin.lineinfile: + path: /etc/rspamd/dkim_selectors.map + line: "{{ virtual_domain }} {{ dkim_selector }}" + create: true + owner: root + group: root + mode: "644" + notify: Reload rspamd service + - name: Print DKIM TXT record for the DNS zone ansible.builtin.debug: msg: "Don't forget to add this to your DNS zone:\n{{ dkim_txt_record.stdout }}" diff --git a/roles/mailserver_dkim/tasks/main.yml b/roles/mailserver_dkim/tasks/main.yml index b9954d8..662b949 100644 --- a/roles/mailserver_dkim/tasks/main.yml +++ b/roles/mailserver_dkim/tasks/main.yml @@ -22,4 +22,15 @@ register: dkim_txt_record notify: - Save DKIM TXT record to a file + - Add selector to DKIM selectors map - Print DKIM TXT record for the DNS zone + +- name: Copy dkim_signing local config + become: true + ansible.builtin.template: + src: dkim_signing.conf.j2 + dest: /etc/rspamd/local.d/dkim_signing.conf + owner: root + group: root + mode: "644" + notify: Reload rspamd service diff --git a/roles/mailserver_dkim/templates/dkim_signing.conf.j2 b/roles/mailserver_dkim/templates/dkim_signing.conf.j2 new file mode 100644 index 0000000..f83a9d5 --- /dev/null +++ b/roles/mailserver_dkim/templates/dkim_signing.conf.j2 @@ -0,0 +1,4 @@ +# {{ ansible_managed }} + +path = "/var/lib/rspamd/dkim/$domain.$selector.key"; +selector_map = "/etc/rspamd/dkim_selectors.map";