From 08b567e3d93b48442e451142c6d809f33830e4ee Mon Sep 17 00:00:00 2001 From: kaiyou Date: Sun, 5 Nov 2017 16:55:37 +0100 Subject: [PATCH] Disable deprecated rmilter --- docs/compose/docker-compose.yml.dist | 12 +-- services/rmilter/Dockerfile | 12 --- services/rmilter/rmilter-clamav.conf | 18 ----- services/rmilter/rmilter.conf | 113 --------------------------- services/rmilter/rsyslog.conf | 4 - services/rmilter/start.sh | 16 ---- 6 files changed, 1 insertion(+), 174 deletions(-) delete mode 100644 services/rmilter/Dockerfile delete mode 100644 services/rmilter/rmilter-clamav.conf delete mode 100644 services/rmilter/rmilter.conf delete mode 100644 services/rmilter/rsyslog.conf delete mode 100755 services/rmilter/start.sh diff --git a/docs/compose/docker-compose.yml.dist b/docs/compose/docker-compose.yml.dist index 54b6439f..588ba083 100644 --- a/docs/compose/docker-compose.yml.dist +++ b/docs/compose/docker-compose.yml.dist @@ -25,7 +25,7 @@ services: - "$BIND_ADDRESS6:995:995" - "$BIND_ADDRESS6:25:25" - "$BIND_ADDRESS6:465:465" - - "$BIND_ADDRESS6:587:587" + - "$BIND_ADDRESS6:587:587" volumes: - "$ROOT/certs:/certs" @@ -54,16 +54,6 @@ services: - "$ROOT/data:/data" - "$ROOT/overrides:/overrides" - milter: - # build: rmilter - image: mailu/rmilter:$VERSION - restart: always - env_file: .env - volumes: - - "$ROOT/filter:/data" - - "$ROOT/dkim:/dkim" - - "$ROOT/overrides:/overrides" - antispam: # build: rspamd image: mailu/rspamd:$VERSION diff --git a/services/rmilter/Dockerfile b/services/rmilter/Dockerfile deleted file mode 100644 index 2b165524..00000000 --- a/services/rmilter/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM alpine:edge - -RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ - && apk add --no-cache rmilter@testing rsyslog bash - -COPY rmilter.conf /etc/rmilter.conf -COPY rmilter-clamav.conf /etc/rmilter-clamav.conf -COPY rsyslog.conf /etc/rsyslog.conf - -COPY start.sh /start.sh - -CMD ["/start.sh"] diff --git a/services/rmilter/rmilter-clamav.conf b/services/rmilter/rmilter-clamav.conf deleted file mode 100644 index b8f38f5e..00000000 --- a/services/rmilter/rmilter-clamav.conf +++ /dev/null @@ -1,18 +0,0 @@ -clamav { - # servers - clamav socket definitions in format: - servers = antivirus:3310; - # connect_timeout - timeout in miliseconds for connecting to clamav - connect_timeout = 1s; - # port_timeout - timeout in miliseconds for waiting for clamav port response - port_timeout = 4s; - # results_timeout - timeout in miliseconds for waiting for clamav response - results_timeout = 20s; - # error_time - time in seconds during which we are counting errors - error_time = 10; - # dead_time - time in seconds during which we are thinking that server is down - dead_time = 300; - # maxerrors - maximum number of errors that can occur during error_time to make us thinking that - # Default: 10 - maxerrors = 10; -}; - diff --git a/services/rmilter/rmilter.conf b/services/rmilter/rmilter.conf deleted file mode 100644 index 64a0424e..00000000 --- a/services/rmilter/rmilter.conf +++ /dev/null @@ -1,113 +0,0 @@ -# pidfile - path to pid file -pidfile = /run/rmilter.pid; - -# bind_socket - socket credits for local bind: -bind_socket = inet:9900 - -# tempdir - path to directory that contains temporary files -tempdir = /tmp; - -# tempfiles_mode - set permission for temp files -tempfiles_mode = 00600; - -# max_size - maximum size of scanned mail with clamav and dcc -max_size = 10M; - -# strict_auth - strict checks for mails from authenticated senders -strict_auth = no; - -# use_dcc - whether use or not dcc system -use_dcc = no; -use_redis = yes; - -spamd { - # servers - spamd socket definitions in format: - servers = r:antispam:11333; - # connect_timeout - timeout in milliseconds for connecting to spamd - connect_timeout = 1s; - # results_timeout - timeout in milliseconds for waiting for spamd response - results_timeout = 20s; - # error_time - time in seconds during which we are counting errors - error_time = 10; - # dead_time - time in seconds during which we are thinking that server is down - dead_time = 300; - # maxerrors - maximum number of errors that can occur during error_time to make us thinking that - maxerrors = 10; - # reject_message - reject message for spam - reject_message = "Spam message rejected; If this is not spam contact abuse"; - # whitelist - list of ips or nets that should be not checked with spamd - whitelist = 127.0.0.1/32, [::1]/128, {{ WHITELIST }}; - # rspamd_metric - metric for using with rspamd - rspamd_metric = "default"; - # Do not reject, add header - spamd_never_reject = yes; - # Add extended spam headers - extended_spam_headers = yes; -}; - -redis { - # servers_grey - redis servers for greylisting in format: - servers_grey = redis:6379; - # servers_white - redis servers for whitelisting in format similar to that is used - servers_white = redis:6379; - # servers_limits - redis servers used for limits storing, can not be mirrored - servers_limits = redis:6379; - # servers_id - redis servers used for message id storing, can not be mirrored - servers_id = redis:6379; - # id_prefix - prefix for extracting message ids from redis - id_prefix = "message_id."; - # grey_prefix - prefix for extracting greylisted records from redis - grey_prefix = "grey."; - # id_prefix - prefix for extracting whitelisted records from redis - white_prefix = "white."; - # connect_timeout - timeout in miliseconds for waiting for redis - connect_timeout = 1s; - # error_time - time in seconds during which we are counting errors - error_time = 10; - # dead_time - time in seconds during which we are thinking that server is down - dead_time = 300; - # maxerrors - maximum number of errors that can occur during error_time to make us thinking that - maxerrors = 10; -}; - -# limits section -limits { - # Whitelisted ip or networks - limit_whitelist = 127.0.0.1, [::1]/128, {{ WHITELIST }}; - # Whitelisted recipients - limit_whitelist_rcpt = postmaster, mailer-daemon; - # Addrs for bounce checks - limit_bounce_addrs = postmaster, mailer-daemon, symantec_antivirus_for_smtp_gateways, <>, null, fetchmail-daemon; - # Limit for bounce mail - limit_bounce_to = 5:0.000277778; - # Limit for bounce mail per one source ip - limit_bounce_to_ip = 5:0.000277778; - # Limit for all mail per recipient - limit_to = 20:0.016666667; - # Limit for all mail per one source ip - limit_to_ip = 30:0.025; - # Limit for all mail per one source ip and from address - limit_to_ip_from = 100:0.033333333; -}; - - -greylisting { - timeout = 300s; - expire = 3d; - whitelist = 127.0.0.1, [::1]/128, {{ WHITELIST }}; -}; - -dkim { - domain { - key = /dkim; - domain = "*"; - selector = "dkim"; - }; - header_canon = relaxed; - body_canon = relaxed; - sign_alg = sha256; - auth_only = yes; - sign_networks = 127.0.0.1, [::1]/128, {{ WHITELIST }}; -}; - -.try_include /overrides/rmilter.conf diff --git a/services/rmilter/rsyslog.conf b/services/rmilter/rsyslog.conf deleted file mode 100644 index 13353b80..00000000 --- a/services/rmilter/rsyslog.conf +++ /dev/null @@ -1,4 +0,0 @@ -$ModLoad imuxsock -$template noTimestampFormat,"%syslogtag%%msg%\n" -$ActionFileDefaultTemplate noTimestampFormat -*.*;auth,authpriv.none /dev/stdout diff --git a/services/rmilter/start.sh b/services/rmilter/start.sh deleted file mode 100755 index ccd32981..00000000 --- a/services/rmilter/start.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -export WHITELIST=$(echo "$RELAYNETS" | sed 's/ /,/g') - -# Substitute configuration -for VARIABLE in `env | cut -f1 -d=`; do - sed -i "s={{ $VARIABLE }}=${!VARIABLE}=g" /etc/rmilter.conf -done - -rm -f /var/run/rsyslogd.pid -if [ "$ANTIVIRUS" == "clamav" ]; -then - echo ".try_include /etc/rmilter-clamav.conf" >> /etc/rmilter.conf -fi -rmilter -c /etc/rmilter.conf -rsyslogd -n