Major cleanup of postfix rules (and other improvements).

1 files changed, 10 insertions, 9 deletions

diff --git a/logcheck/ignore.d.server/postfix b/logcheck/ignore.d.server/postfix
index 8015d24..5a777a4 100644
--- a/logcheck/ignore.d.server/postfix
+++ b/logcheck/ignore.d.server/postfix
@@ -5,9 +5,10 @@ postfix/master\[[0-9]+\]: reload configuration$
 postfix/n?qmgr\[[0-9]+\]: [A-Z0-9]+: skipped, still being delivered$
 postfix/postfix-script: refreshing the Postfix mail system$
 postfix/smtp\[[0-9]+\]: Peer certi?ficate could not be verified$
+postfix/smtp\[[0-9]+\]: SSL_connect error to express.ikokok.com: -1
 postfix/smtp\[[0-9]+\]: [A-Z0-9]+: enabling PIX <CRLF>\.<CRLF> workaround for [^[:space:]]+\[[\.0-9]+\]$
-postfix/smtp\[[0-9]+\]: [^[:space:]]+ status=deferred \(connect to [^[:space:]]+: (Connection refused|server refused mail service)\)$
-postfix/smtp\[[0-9]+\]: connect to [^[:space:]]+: (Connection (refused|reset by peer|timed out)|read timeout|server (refused mail service|dropped connection)|No route to host) \(port 25\)$
+postfix/smtp\[[0-9]+\]: [^[:space:]]+ status=deferred \(connect to [^[:space:]]+\[[\.0-9]+\]: (Connection refused|server refused mail service)\)$
+postfix/smtp\[[0-9]+\]: connect to [^[:space:]]+\[[\.0-9]+\]: (Connection (refused|reset by peer|timed out)|read timeout|server (refused mail service|dropped connection)|No route to host) \(port 25\)$
 postfix/smtp\[[0-9]+\]: setting up TLS connection to [^[:space:]]+$
 postfix/smtp\[[0-9]+\]: verify error:num=18:self signed certificate$
 postfix/smtp\[[0-9]+\]: warning: bad size limit "truncates" in EHLO reply from [^[:space:]]+$
@@ -16,15 +17,15 @@ postfix/smtp\[[0-9]+\]: warning: no MX host for [^[:space:]]+ has a valid A reco
 postfix/smtpd?\[[0-9]+\]: (Unv|V)erified: subject_CN=[^,]+, issuer=[^,]+$
 postfix/smtpd?\[[0-9]+\]: TLS connection established (from|to) [^[:space:]]+: (SSLv3|TLSv1) with cipher [^[:space:]]+ \([0-9/]+ bits\)$
 postfix/smtpd?\[[0-9]+\]: fingerprint=[0-9A-F:]+$
-postfix/smtpd?\[[0-9]+\]: setting up TLS connection from [^[:space:]]+\[[\.0-9]+\]$
+postfix/smtpd?\[[0-9]+\]: setting up TLS connection (from|to) [^[:space:]]+\[[\.0-9]+\]$
 postfix/smtpd?\[[0-9]+\]: warning: (numeric|malformed) domain name in resource data of MX record for [^[:space:]]+: [^[:space:]]*$
 postfix/smtpd?\[[0-9]+\]: warning: valid_hostname: (empty hostname|invalid character [0-9]+\(decimal\): [^[:space:]]+)$
-postfix/smtpd\[[0-9]+\]: (lost connection|timeout) after [^ ]+ from [^[:space:]]+\[[\.0-9]+\]$
-postfix/smtpd\[[0-9]+\]: warning: Illegal address syntax from [^[:space:]\[]+\[[\.0-9]+\] in (MAIL command: <[^>]+>|RCPT command: )$
 postfix/smtpd\[[0-9]+\]: ((dis)?connect|setting up TLS connection|lost connection after AUTH) from [^[:space:]]+\[[\.0-9]+\]$
+postfix/smtpd\[[0-9]+\]: (lost connection|timeout) after [^ ]+ from [^[:space:]]+\[[\.0-9]+\]$
 postfix/smtpd\[[0-9]+\]: [A-Z0-9]+: [^[:space:]]+\[[\.0-9]+\], sasl_method=PLAIN, sasl_username=[[:alnum:]]+$
-postfix/smtpd\[[0-9]+\]: warning: [^[:space:]]+ sent (message header|mail content) instead of SMTP command:
-postfix/smtpd\[[0-9]+\]: warning: [^[:space:]]+: address not listed for hostname [^[:space:]]+$
-postfix/smtpd\[[0-9]+\]: warning: [^[:space:]]+: hostname [^[:space:]]+ verification failed: Host (name has no address|not found)$
+postfix/smtpd\[[0-9]+\]: warning: Illegal address syntax from [^[:space:]\[]+\[[\.0-9]+\] in (MAIL command: <[^>]+>|RCPT command: )$
+postfix/smtpd\[[0-9]+\]: warning: [^[:space:]]+\[[\.0-9]+\] sent ([^[:space:]]+ header|mail content) instead of SMTP command: .*
+postfix/smtpd\[[0-9]+\]: warning: [^[:space:]]+\[[\.0-9]+\]: address not listed for hostname [^[:space:]]+$
+postfix/smtpd\[[0-9]+\]: warning: [^[:space:]]+\[[\.0-9]+\]: hostname [^[:space:]]+ verification failed: Host (name has no address|not found)$
 # These are only for postfix >= 2.0:
-postfix/smtp\[[0-9]+\]: connect to [^[:space:]]+: server dropped connection without sending the initial greeting \(port 25\)$
+postfix/smtp\[[0-9]+\]: connect to [^[:space:]]+\[[\.0-9]+\]: server dropped connection without sending the initial greeting \(port 25\)$