Another postfix 2.0 tweak. And squid has spaces at end of their lines.

5 files changed, 14 insertions, 14 deletions

diff --git a/logcheck/ignore.d.server/local b/logcheck/ignore.d.server/local
index a5d1fc6..58fad4d 100644
--- a/logcheck/ignore.d.server/local
+++ b/logcheck/ignore.d.server/local
@@ -264,15 +264,15 @@ spamd\[[0-9]+\]: clean message for
 spamd\[[0-9]+\]: identified spam for
 spamd\[[0-9]+\]: skipped large message in
 ### ignore.d.server/squid
-squid\[[0-9]+\]:   Finished.  Wrote [0-9]+ entries\.$
-squid\[[0-9]+\]:   Took [\.0-9]+ seconds \([\.0-9]+ entries/sec\)\.$
+squid\[[0-9]+\]:   Finished.  Wrote [0-9]+ entries\. $
+squid\[[0-9]+\]:   Took [\.0-9]+ seconds \([\.0-9]+ entries/sec\)\. $
 squid\[[0-9]+\]: (Closing Pinger socket|Pinger socket opened) on FD [0-9]+$
 squid\[[0-9]+\]: (access|store)LogRotate: Rotating(\.)?$
 squid\[[0-9]+\]: NETDB state saved;$
 squid\[[0-9]+\]: helperOpenServers: Starting [0-9]+ '.*' processes
-squid\[[0-9]+\]: logfileRotate: /var/log/squid/(access|store).log$
+squid\[[0-9]+\]: logfileRotate: /var/log/squid/(access|store).log $
 squid\[[0-9]+\]: sslReadServer: FD [0-9]+: read failure: \(104\) Connection reset by peer $
-squid\[[0-9]+\]: storeDirWriteCleanLogs: Starting\.\.\.$
+squid\[[0-9]+\]: storeDirWriteCleanLogs: Starting\.\.\. $
 squid\[[0-9]+\]: urlParse: Illegal character in hostname '[^']+' $
 ### ignore.d.server/ssh
 sshd\[[0-9]+\]: syslogin_perform_logout: logout\(\) returned an error$
diff --git a/logcheck/ignore.d.server/squid b/logcheck/ignore.d.server/squid
index 02eb068..f077a95 100644
--- a/logcheck/ignore.d.server/squid
+++ b/logcheck/ignore.d.server/squid
@@ -1,10 +1,10 @@
-squid\[[0-9]+\]:   Finished.  Wrote [0-9]+ entries\.$
-squid\[[0-9]+\]:   Took [\.0-9]+ seconds \([\.0-9]+ entries/sec\)\.$
+squid\[[0-9]+\]:   Finished.  Wrote [0-9]+ entries\. $
+squid\[[0-9]+\]:   Took [\.0-9]+ seconds \([\.0-9]+ entries/sec\)\. $
 squid\[[0-9]+\]: (Closing Pinger socket|Pinger socket opened) on FD [0-9]+$
 squid\[[0-9]+\]: (access|store)LogRotate: Rotating(\.)?$
 squid\[[0-9]+\]: NETDB state saved;$
 squid\[[0-9]+\]: helperOpenServers: Starting [0-9]+ '.*' processes
-squid\[[0-9]+\]: logfileRotate: /var/log/squid/(access|store).log$
+squid\[[0-9]+\]: logfileRotate: /var/log/squid/(access|store).log $
 squid\[[0-9]+\]: sslReadServer: FD [0-9]+: read failure: \(104\) Connection reset by peer $
-squid\[[0-9]+\]: storeDirWriteCleanLogs: Starting\.\.\.$
+squid\[[0-9]+\]: storeDirWriteCleanLogs: Starting\.\.\. $
 squid\[[0-9]+\]: urlParse: Illegal character in hostname '[^']+' $
diff --git a/logcheck/ignore.d.workstation/local b/logcheck/ignore.d.workstation/local
index d307208..a7ff281 100644
--- a/logcheck/ignore.d.workstation/local
+++ b/logcheck/ignore.d.workstation/local
@@ -264,15 +264,15 @@ spamd\[[0-9]+\]: clean message for
 spamd\[[0-9]+\]: identified spam for
 spamd\[[0-9]+\]: skipped large message in
 ### ignore.d.server/squid
-squid\[[0-9]+\]:   Finished.  Wrote [0-9]+ entries\.$
-squid\[[0-9]+\]:   Took [\.0-9]+ seconds \([\.0-9]+ entries/sec\)\.$
+squid\[[0-9]+\]:   Finished.  Wrote [0-9]+ entries\. $
+squid\[[0-9]+\]:   Took [\.0-9]+ seconds \([\.0-9]+ entries/sec\)\. $
 squid\[[0-9]+\]: (Closing Pinger socket|Pinger socket opened) on FD [0-9]+$
 squid\[[0-9]+\]: (access|store)LogRotate: Rotating(\.)?$
 squid\[[0-9]+\]: NETDB state saved;$
 squid\[[0-9]+\]: helperOpenServers: Starting [0-9]+ '.*' processes
-squid\[[0-9]+\]: logfileRotate: /var/log/squid/(access|store).log$
+squid\[[0-9]+\]: logfileRotate: /var/log/squid/(access|store).log $
 squid\[[0-9]+\]: sslReadServer: FD [0-9]+: read failure: \(104\) Connection reset by peer $
-squid\[[0-9]+\]: storeDirWriteCleanLogs: Starting\.\.\.$
+squid\[[0-9]+\]: storeDirWriteCleanLogs: Starting\.\.\. $
 squid\[[0-9]+\]: urlParse: Illegal character in hostname '[^']+' $
 ### ignore.d.server/ssh
 sshd\[[0-9]+\]: syslogin_perform_logout: logout\(\) returned an error$
diff --git a/logcheck/violations.ignore.d/local b/logcheck/violations.ignore.d/local
index 67d289f..ab4c42d 100644
--- a/logcheck/violations.ignore.d/local
+++ b/logcheck/violations.ignore.d/local
@@ -45,7 +45,7 @@ postfix/local\[[0-9]+\]: warning: unable to create lock file /var/mail/[[:alnum:
 postfix/nqmgr\[[0-9]+\]: [A-Z0-9]+: from=<[^[:space:]>]+>, size=[0-9]+, nrcpt=[0-9]+ \(queue active\)$
 postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(Name service error for [^[:space:]:]+: Host not found\)$
 postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(bad host/domain syntax: "[^"]+"\)$
-postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(host 127\.0\.0\.1\[127\.0\.0\.1\] said: 550 Message content rejected, id=[^\)]+\)$
+postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(host 127\.0\.0\.1\[127\.0\.0\.1\] said: 550 Message content rejected, id=[^\)]+\)?\)$
 postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(host [^[:space:]]+ said: 504 <[^>]+>: Sender address rejected: need fully-qualified address$
 postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(host [^[:space:]]+ said: 550 [^\)]+ (Access denied|Recipient address rejected|Relaying denied|Sender Not Authorised|unknown or illegal alias|User unknown; rejecting)[^\)]*\)$
 postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(host [^[:space:]]+ said: 552 header content rejected: see [^\)]+\)$
diff --git a/logcheck/violations.ignore.d/postfix b/logcheck/violations.ignore.d/postfix
index 5d6c854..3374ccc 100644
--- a/logcheck/violations.ignore.d/postfix
+++ b/logcheck/violations.ignore.d/postfix
@@ -6,7 +6,7 @@ postfix/local\[[0-9]+\]: warning: unable to create lock file /var/mail/[[:alnum:
 postfix/nqmgr\[[0-9]+\]: [A-Z0-9]+: from=<[^[:space:]>]+>, size=[0-9]+, nrcpt=[0-9]+ \(queue active\)$
 postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(Name service error for [^[:space:]:]+: Host not found\)$
 postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(bad host/domain syntax: "[^"]+"\)$
-postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(host 127\.0\.0\.1\[127\.0\.0\.1\] said: 550 Message content rejected, id=[^\)]+\)$
+postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(host 127\.0\.0\.1\[127\.0\.0\.1\] said: 550 Message content rejected, id=[^\)]+\)?\)$
 postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(host [^[:space:]]+ said: 504 <[^>]+>: Sender address rejected: need fully-qualified address$
 postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(host [^[:space:]]+ said: 550 [^\)]+ (Access denied|Recipient address rejected|Relaying denied|Sender Not Authorised|unknown or illegal alias|User unknown; rejecting)[^\)]*\)$
 postfix/smtp\[[0-9]+\]: [^\(]+ status=bounced \(host [^[:space:]]+ said: 552 header content rejected: see [^\)]+\)$