aports/unmaintained/rmilter/config.patch

157 lines
4.3 KiB
Diff

--- a/rmilter.conf.sample
+++ b/rmilter.conf.sample
@@ -1,24 +1,3 @@
-# Sample config file for rmilter
-# $Id$
-#
-
-# .include - directive to include other config file
-#.include ./rmilter-grey.conf
-
-# pidfile - path to pid file
-# Default: pidfile = /var/run/rmilter.pid
-pidfile = /var/run/rmilter/rmilter.pid;
-
-# bind_socket - socket credits for local bind:
-# unix:/path/to/file - bind to local socket
-# inet:port@host - bind to inet socket
-# Default: bind_socket = unix:/var/tmp/rmilter.sock;
-bind_socket = unix:/var/run/rmilter/rmilter.sock;
-
-# tempdir - path to directory that contains temporary files
-# Default: $TMPDIR
-tempdir = /tmp;
-
# max_size - maximum size of scanned message for ClamAV, Rspamd and DCC
# Default: 0 (no limit)
max_size = 10M;
@@ -27,14 +6,14 @@
# Default: no
#strict_auth = no;
-# spf_domains - path to file that contains hash of spf domains
-# Default: empty
-#spf_domains = example.com, mail.ru;
-
# use_dcc - whether or not use DCC
# Default: no
#use_dcc = no;
+# use_redis - switch cache to use redis or legacy memcached
+# Default: yes
+use_redis = no;
+
# whitelist - global recipients whitelist
# Default: no
#whitelist = abuse@example.com, postmaster@example.com;
@@ -51,6 +30,7 @@
# sockets are separated by ','
# Default: empty
#servers = clam1.example.com, clam2.example.com;
+
# connect_timeout - timeout in miliseconds for connecting to clamav
# Default: 1s
#connect_timeout = 1s;
@@ -84,13 +64,13 @@
# sockets are separated by ','
# if server name is prefixed with 'r:' it is an Rspamd server
# Default: empty
- servers = r:localhost:11333;
+ #servers = r:localhost:11333;
# also_check - extra Rspamd servers to check
#also_check = r:clam10.example.com;
# diff_dir - path where to write messages that have different results from main and extra checks
- #diff_dir = /var/run/rmilter/diffmsg;
+ #diff_dir = /run/rmilter/diffmsg;
# connect_timeout - timeout in miliseconds for connecting to spamd
# Default: 1s
@@ -147,17 +127,17 @@
redis {
# servers_grey - redis servers for greylisting in format:
# host[:port][, host[:port]]
- servers_grey = localhost;
+ #servers_grey = localhost;
# servers_white - redis servers for whitelisting in format similar to that is used
# in servers_grey
- servers_white = localhost;
+ #servers_white = localhost;
# servers_limits - redis servers used for limits storing, can not be mirrored
- servers_limits = localhost;
+ #servers_limits = localhost;
# servers_id - redis servers used for message id storing, can not be mirrored
- servers_id = localhost;
+ #servers_id = localhost;
# servers_spam - redis servers used to send spam messages
#servers_spam = localhost;
@@ -207,7 +187,6 @@
#maxerrors = 10;
};
-
# rule definition:
# rule {
# accept|discard|reject|tempfail|quarantine "[message]"; <- action definition
@@ -223,7 +202,7 @@
limits {
# enable: enable or disable rate limits (binary flag)
# Default: true
- #enable = yes;
+ enable = no;
# Whitelisted ip or networks
#limit_whitelist = 194.67.45.4/32;
@@ -246,7 +225,7 @@
greylisting {
# enable - enable or disable greylisting (binary flag)
# Default: true
- #enable = yes;
+ enable = no;
# timeout - time during which we mark message greylisted
# Default: 300s
@@ -264,23 +243,23 @@
dkim {
# enable - enable or disable DKIM signing (binary flag)
# Default: true
- #enable = yes;
+ enable = no;
# Sample for dkim specific keys
# domain {
- # key = /etc/dkim/dkim_example.key;
+ # key = /etc/mail/dkim/dkim_example.key;
# domain = "example.com";
# selector = "dkim";
# };
# domain {
- # key = /etc/dkim/dkim_test.key;
+ # key = /etc/mail/dkim/dkim_test.key;
# domain = "test.com";
# selector = "dkim";
# };
- # Universal selector, keys will be checked for pattern /etc/dkim/<domain>.<selector>.key
+ # Universal selector, keys will be checked for pattern /etc/mail/dkim/<domain>.<selector>.key
domain {
- key = /usr/local/etc/dkim;
+ key = /etc/mail/dkim;
domain = "*";
selector = "dkim";
};
@@ -288,8 +267,3 @@
body_canon = relaxed;
sign_alg = sha256;
};
-
-
-# include user's configuration, replace this with full path
-.try_include /usr/local/etc/rmilter.conf.local
-.try_include /usr/local/etc/rmilter.conf.d/*.conf