Merge remote-tracking branch 'stevee/next-suricata' into next

[people/pmueller/ipfire-2.x.git] / config / etc / syslog.conf

diff --git a/config/etc/syslog.conf b/config/etc/syslog.conf
index bd49f61ed90679b11d6f80b6c29a8047bbf3c749..b2b5489697dcd24d74c8a8b93e17c5e0e31360e4 100644 (file)
--- a/config/etc/syslog.conf
+++ b/config/etc/syslog.conf
@@ -5,22 +5,22 @@
 # Log anything (except mail) of level info or higher.
 # Don't log private authentication messages!
 # local0.* any dhcpcd log (even debug) in messages
-daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.* /var/log/messages
+cron.none;daemon.*;local0.*;local2.*;local5.*;*.info;mail.none;authpriv.*      -/var/log/messages
 
 # Log crons
-cron.*                                                 -/var/log/cron.log
+#cron.*                                                                                -/var/log/cron.log
 
 # Everybody gets emergency messages
-*.emerg                                                *
-
-# Save boot messages also to boot.log
-local7.*                                               /var/log/boot.log
+*.emerg                                                                                *
 
 # Display logs on tty12
-*.*                                                    /dev/tty12
+*.*                                                                                            /dev/tty12
 
 # Optionally log to a remote host
-#*.*                                                   @hostname.domain
+#*.*                                                                                   @hostname.domain
 
 # Postfix logs
-mail.*                                                 /var/log/mail
+mail.*                                                                         -/var/log/mail
+
+# HAProxy
+local1.*                                                               -/var/log/haproxy