Merge pull request #521 from carljm/rmilter

Complete rmilter/rspamd setup.

roles/mailserver/files/etc_rmilter.conf.common

@@ -0,0 +1,12 @@
+spamd {
+	servers = r:localhost:11333;
+	whitelist = 127.0.0.1/32, 192.168.0.0/16, [::1]/128;
+};
+
+redis {
+	servers_id = localhost;
+	id_prefix = "message_id.";
+};
+
+tempdir = /tmp;
+max_size = 10M;

roles/mailserver/files/lib_systemd_system_rmilter.socket

@@ -0,0 +1,8 @@
+[Unit]
+Description=Another sendmail milter for different mail checks
+
+[Socket]
+ListenStream=9900
+
+[Install]
+WantedBy=sockets.target

roles/mailserver/tasks/rspamd.yml

@@ -11,10 +11,26 @@
   tags:
     - dependencies
 
-- name: Install Rspamd and Rmilter
+- name: Install Rspamd, Rmilter, and Redis
   apt: pkg={{ item }} state=installed update_cache=yes
   with_items:
     - rspamd
     - rmilter
+    - redis-server
   tags:
     - dependencies
+
+- name: Configure rmilter
+  copy: src=etc_rmilter.conf.common dest=/etc/rmilter.conf.common
+
+- name: Configure rmilter socket service
+  copy: src=lib_systemd_system_rmilter.socket dest=/lib/systemd/system/rmilter.socket
+
+- name: Start redis
+  service: name=redis-server state=started
+
+- name: Start rspamd systemd socket listener
+  service: name=rspamd.socket state=started
+
+- name: Start rmilter systemd socket listener
+  service: name=rmilter.socket state=started

roles/mailserver/templates/etc_postfix_main.cf.j2

@@ -101,7 +101,7 @@ virtual_alias_maps = pgsql:/etc/postfix/pgsql-virtual-alias-maps.cf
 local_recipient_maps = $virtual_mailbox_maps
 
 # Milters: OpenDKIM, OpenDMARC, Rspamd
-smtpd_milters = inet:127.0.0.1:8891,inet:127.0.0.1:54321,unix:/var/run/rmilter/rmilter.sock
+smtpd_milters = inet:127.0.0.1:8891,inet:127.0.0.1:54321,inet:127.0.0.1:9900
 non_smtpd_milters = $smtpd_milters
 milter_protocol = 6
 milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} {auth_type}