- s/unix-stream/unix-dgram/ - klogd didn't work because of this

- reading kernel messages through /proc/kmsg removed - it's klogd job
- big rename in /var/log for compatibility with standard syslog
- s/Debian/PLD/ in comments
- there is no PPP facility, fixed that
- other cleanups

Changed files:
    syslog-ng.conf -> 1.3

diff --git a/syslog-ng.conf b/syslog-ng.conf
index 9e339fc06d6c9571f1554542377259f60eff6205..79abc79435f28db4d1718013b6b3df0a4c991dee 100644 (file)
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -1,93 +1,104 @@
 #
-# Syslog-ng example configuration for for Debian GNU/Linux
+# Syslog-ng example configuration for PLD GNU/Linux
 #
 # Copyright (c) 1999 anonymous
 # Copyright (c) 1999 Balazs Scheidler
 # $Id$
 #
-# Syslog-ng configuration file, compatible with default Debian syslogd
+# Syslog-ng configuration file, compatible with default PLD syslogd
 # installation. 
 #
 
 options { long_hostnames(off); sync(0); };
 
-source src { unix-stream("/dev/log"); internal(); };
-source kmsg { file("/proc/kmsg"); };
-source net { udp(); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); };
-destination kmsg { file("/var/log/kernel"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-#destination loghost { udp("loghost" port(999)); };
-
-
-destination xconsole { pipe("/dev/xconsole"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_user { facility(user); };
-filter f_uucp { facility(cron); };
-filter f_ppp { facility(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn) 
-       and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-log { source(kmsg); destination(kmsg); };
-log { source(kmsg); destination(tty12); };
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(src); filter(f_kern); destination(kern); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-log { source(src); filter(f_ppp); destination(ppp); };
+source src     { unix-dgram("/dev/log"); internal(); };
+source net     { udp(); };
+
+#destination loghost   { udp("loghost" port(999)); };
+
+destination kern       { file("/var/log/kernel"); };
+destination messages   { file("/var/log/messages"); };
+destination authlog    { file("/var/log/secure"); };
+destination mail       { file("/var/log/maillog"); };
+destination uucp       { file("/var/log/spooler"); };
+
+destination debug      { file("/var/log/debug"); };
+destination console    { usertty("root"); };
+destination console_all        { file("/dev/tty12"); };
+destination tty12      { file("/dev/tty12"); };
+
+destination xconsole   { pipe("/dev/xconsole"); };
+
+destination mailinfo   { file("/var/log/mail/info"); };
+destination mailwarn   { file("/var/log/mail/warn"); };
+destination mailerr    { file("/var/log/mail/err"); };
+
+destination newscrit   { file("/var/log/news/news.crit"); };
+destination newserr    { file("/var/log/news/news.err"); };
+destination newsnotice { file("/var/log/news/news.notice"); };
+
+destination cron       { file("/var/log/cron"); };
+destination syslog     { file("/var/log/syslog"); };
+destination daemon     { file("/var/log/daemon"); };
+destination lpr                { file("/var/log/lpr"); };
+destination user       { file("/var/log/user"); };
+destination ppp                { file("/var/log/ppp"); };
+
+# Log iptables messages to separate file
+#destination iptables  { file("/var/log/iptables"); };
+
+filter f_auth          { facility(auth); };
+filter f_authpriv      { facility(auth, authpriv); };
+filter f_syslog                { not facility(authpriv, mail, news); };
+filter f_cron          { facility(cron); };
+filter f_daemon                { facility(daemon); };
+filter f_kern          { facility(kern); };
+filter f_lpr           { facility(lpr); };
+filter f_mail          { facility(mail); };
+filter f_user          { facility(user); };
+filter f_uucp          { facility(cron); };
+filter f_ppp           { facility(daemon) and program(pppd) or program(chat); };
+filter f_news          { facility(news); };
+filter f_messages      { level(info..warn) 
+                       and not facility(auth, authpriv, mail, news, daemon); };
+
+filter p_debug         { level(debug); };
+filter p_info          { level(info); };
+filter p_notice                { level(notice); };
+filter p_warn          { level(warn); };
+filter p_err           { level(err); };
+filter p_alert         { level(alert); };
+filter p_crit          { level(crit); };
+filter p_emergency     { level(emerg); };
+
+filter f_iptables      { facility(kern) and match("IN=[A-Za-z0-9]* OUT=[A-Za-z0-9]*"); };
+
+log { source(src); filter(f_kern);     destination(kern); };
+
+log { source(src); filter(f_authpriv); destination(authlog); };
+log { source(src); filter(f_syslog);   destination(syslog); };
+log { source(src); filter(f_cron);     destination(cron); };
+log { source(src); filter(f_daemon);   destination(daemon); };
+log { source(src); filter(f_lpr);      destination(lpr); };
+log { source(src); filter(f_user);     destination(user); };
+log { source(src); filter(f_uucp);     destination(uucp); };
+log { source(src); filter(f_messages); destination(messages); };
+log { source(src); filter(f_ppp);      destination(ppp); };
+log { source(src); filter(p_debug);    destination(debug); };
+log { source(src); filter(p_emergency);        destination(console); };
 log { source(src); destination(console_all); };
 
+log { source(src); filter(f_mail);                     destination(mail); };
+log { source(src); filter(f_mail); filter(p_info);     destination(mailinfo); };
+log { source(src); filter(f_mail); filter(p_warn);     destination(mailwarn); };
+log { source(src); filter(f_mail); filter(p_err);      destination(mailerr); };
+
+log { source(src); filter(f_news); filter(p_crit);     destination(uucp); };
+log { source(src); filter(f_news); filter(p_crit);     destination(newscrit); };
+log { source(src); filter(f_news); filter(p_err);      destination(newserr); };
+log { source(src); filter(f_news); filter(p_warn);     destination(newsnotice); };
+log { source(src); filter(f_news); filter(p_notice);   destination(newsnotice); };
+log { source(src); filter(f_news); filter(p_info);     destination(newsnotice); };
+log { source(src); filter(f_news); filter(p_debug);    destination(newsnotice); };
 
+log { source(src); filter(f_iptables); destination(iptables); };