ソースを参照

Remove rmilter from mailserver configuration

Rmilter [is no longer
needed](https://rspamd.com/doc/quickstart.html#rmilter-setup) as of
Rspamd 1.6.
Mike Ashley 7年前
コミット
c9bb6dba92

+ 12
- 0
roles/mailserver/DESIGN.md ファイルの表示

@@ -0,0 +1,12 @@
1
+# Design Description for Mailserver Role
2
+
3
+## Mail filters
4
+
5
+Four mail filters are used:
6
+
7
+* [Postgrey](http://postgrey.schweikert.ch/), which runes on port 10023 and is hooked into postfix with the `smtpd_recipient_restrictions` variable;
8
+* [OpenDKIM](http://www.opendkim.org/), which runs on port 8891;
9
+* [OpenDMARC](http://www.trusteddomain.org/opendmarc/), which runs on port 54321; and
10
+* [Rspamd](https://rspamd.com), which runs on port 11332.
11
+
12
+OpenDKIM, OpenDMARC, and Rspamd are all hooked into postfix with the `smtpd_milters` variable.  All of this can be found in `etc_postfix_main.cf`.

+ 0
- 12
roles/mailserver/files/etc_rmilter.conf.common ファイルの表示

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

+ 0
- 8
roles/mailserver/files/lib_systemd_system_rmilter.socket ファイルの表示

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

+ 1
- 14
roles/mailserver/tasks/rspamd.yml ファイルの表示

@@ -25,29 +25,16 @@
25 25
   tags:
26 26
     - dependencies
27 27
 
28
-- name: Install Rspamd, Rmilter, and Redis
28
+- name: Install Rspamd and Redis
29 29
   apt: pkg={{ item }} state=installed update_cache=yes
30 30
   with_items:
31 31
     - rspamd
32
-    - rmilter
33 32
     - redis-server
34 33
   tags:
35 34
     - dependencies
36 35
 
37
-- name: Configure rmilter.common
38
-  copy: src=etc_rmilter.conf.common dest=/etc/rmilter.conf.common
39
-
40
-- name: Configure rmilter socket
41
-  lineinfile: dest=/etc/rmilter.conf regexp=^bind_socket line="bind_socket = inet:9900@localhost;"
42
-
43
-- name: Configure rmilter service
44
-  copy: src=lib_systemd_system_rmilter.socket dest=/lib/systemd/system/rmilter.socket
45
-
46 36
 - name: Start redis
47 37
   service: name=redis-server state=started
48 38
 
49 39
 - name: Start rspamd systemd listener
50 40
   service: name=rspamd state=started
51
-
52
-- name: Start rmilter systemd listener
53
-  service: name=rmilter state=started

+ 1
- 1
roles/mailserver/templates/etc_postfix_main.cf.j2 ファイルの表示

@@ -101,7 +101,7 @@ virtual_alias_maps = pgsql:/etc/postfix/pgsql-virtual-alias-maps.cf
101 101
 local_recipient_maps = $virtual_mailbox_maps
102 102
 
103 103
 # Milters: OpenDKIM, OpenDMARC, Rspamd
104
-smtpd_milters = inet:127.0.0.1:8891,inet:127.0.0.1:54321,inet:127.0.0.1:9900
104
+smtpd_milters = inet:127.0.0.1:8891,inet:127.0.0.1:54321,inet:127.0.0.1:11332
105 105
 non_smtpd_milters = $smtpd_milters
106 106
 milter_protocol = 6
107 107
 milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} {auth_type}

読み込み中…
キャンセル
保存