- merged DEVEL

Changed files:
    syslog-ng-ac25x.patch -> 1.2
    syslog-ng.conf -> 1.16
    syslog-ng.logrotate -> 1.8

diff --git a/syslog-ng-ac25x.patch b/syslog-ng-ac25x.patch
index c99a97b89509c23e0ffdeb83ca9c215e306d4d59..b5aa4311a3830ce03e7196ac042b14b1b7cc148d 100644 (file)
--- a/syslog-ng-ac25x.patch
+++ b/syslog-ng-ac25x.patch
@@ -1,13 +1,15 @@
---- syslog-ng-1.4.15/configure.in.orig Mon May 13 21:12:40 2002
-+++ syslog-ng-1.4.15/configure.in      Mon May 13 21:15:15 2002
-@@ -97,12 +97,12 @@
- AC_FUNC_VPRINTF
+--- syslog-ng-1.5.26/configure.in.orig Fri Jan 31 10:39:59 2003
++++ syslog-ng-1.5.26/configure.in      Fri Feb 14 14:12:27 2003
+@@ -161,13 +161,13 @@
+ AC_CHECK_LIB(resolv, __res_init)
  AC_CHECK_LIB(door, door_create)
  AC_CHECK_FUNCS(select snprintf vsnprintf strerror inet_aton strncpy getutent)
 -AC_CHECK_FUNC(getopt_long,,[LIBOBJS="getopt.o getopt1.o $LIBOBJS"])
 -AC_CHECK_FUNC(strcasecmp,,[LIBOBJS="strcasecmp.o $LIBOBJS"])
-+AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ([getopt]); AC_LIBOBJ([getopt1]);])
+-AC_CHECK_FUNC(strptime,,[LIBOBJS="strptime.o $LIBOBJS"])
++AC_CHECK_FUNC(getopt_long,,[AC_LIBOBJ([getopt]); AC_LIBOBJ([getopt1])])
 +AC_CHECK_FUNC(strcasecmp,,[AC_LIBOBJ([strcasecmp])])
++AC_CHECK_FUNC(strptime,,[AC_LIBOBJ([strptime])])
  
  if test "x$ac_cv_func_snprintf" = "xno" -o \
        "x$ac_cv_func_vsnprintf" = "xno"; then
@@ -16,11 +18,11 @@
  fi
  
  if test "x$ac_cv_lib_door_door_create" = "xyes"; then
-@@ -166,7 +166,6 @@
-       AC_DEFINE(WITH_DEBUG)
- fi
+@@ -263,7 +263,6 @@
+ 
+ LIBS="$LIBS $LEXLIB $LIBOL_LIBS"
  AC_SUBST(YFLAGS)
 -AC_SUBST(LIBOBJS)
  
  AC_SUBST(MAKE_CLASS)
- 
+ AC_DEFINE_UNQUOTED(PATH_SYSCONFDIR, "`eval echo $sysconfdir`")

diff --git a/syslog-ng.conf b/syslog-ng.conf
index e479319ef45bdf4db524587bbfdab72da47ef577..9c517c9d888c4e0f102ef5b2e155e963d4b895be 100644 (file)
--- a/syslog-ng.conf
+++ b/syslog-ng.conf
@@ -11,9 +11,8 @@
 
 options { long_hostnames(off); sync(0); };
 
-source src { pipe("/proc/kmsg"); unix-stream("/dev/log"); internal(); };
-
-# uncomment below line if you want setup syslog server
+source src     { pipe ("/proc/kmsg" log_prefix("kernel: ")); unix-stream("/dev/log"); internal(); };
+# uncomment the line below if you want to setup syslog server
 #source net    { udp(); };
 
 #destination loghost   { udp("loghost" port(999)); };
@@ -30,9 +29,9 @@ destination console   { usertty("root"); };
 
 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 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" owner(news) group(news)); };
 destination newserr    { file("/var/log/news/news.err" owner(news) group(news)); };
@@ -47,18 +46,13 @@ destination ppp             { file("/var/log/ppp"); };
 
 # Log iptables messages to separate file
 destination iptables   { file("/var/log/iptables"); };
-filter f_syslog                { not facility(authpriv, mail, news)
-                       and not match("IN=[A-Za-z0-9]* OUT=[A-Za-z0-9]*")
-                       and not match("cron") ; };
-filter f_iptables      { facility(kern) and match("IN=[A-Za-z0-9]* OUT=[A-Za-z0-9]*"); };
-filter f_kern          { facility(kern)
-                       and not match("IN=[A-Za-z0-9]* OUT=[A-Za-z0-9]*") ; };
 
 filter f_auth          { facility(auth); };
-filter f_authpriv      { facility(auth, authpriv)
-                       and not match("cron"); };
-filter f_cron          { facility(cron) or match("cron"); };
+filter f_authpriv      { facility(auth, authpriv); };
+filter f_syslog                { not facility(authpriv, cron, lpr, 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); };
@@ -66,7 +60,8 @@ 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); };
+                       and not facility(auth, authpriv, cron, lpr, mail, news, daemon); };
+
 filter p_debug         { level(debug); };
 filter p_info          { level(info); };
 filter p_notice                { level(notice); };
@@ -76,6 +71,7 @@ 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); };
 
@@ -90,7 +86,7 @@ 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); destination(console_all); };
 
 log { source(src); filter(f_mail);                     destination(mail); };
 #log { source(src); filter(f_mail); filter(p_info);    destination(mailinfo); };
@@ -105,4 +101,8 @@ 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); };
+#log { source(src); filter(f_iptables);        destination(iptables); };
+
+#  This is a catchall statement, and should catch all messages which were not
+#  accepted any of the previous statements.  
+#log { source(src); filter(DEFAULT); destination(syslog); };

diff --git a/syslog-ng.logrotate b/syslog-ng.logrotate
index d90344bfe3dc9ed008e34f1682adb288a3c6bfda..7c8ce13d6988371c559d846f8cf3897c33478468 100644 (file)
--- a/syslog-ng.logrotate
+++ b/syslog-ng.logrotate
@@ -1,77 +1,66 @@
 /var/log/messages {
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }
 
 /var/log/daemon {
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }
 
 /var/log/debug {
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }
 
 /var/log/iptables {
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }
 
 /var/log/kernel {
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }
 
 /var/log/lpr {
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }
 
 /var/log/maillog {
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }
 
 /var/log/secure {
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }
 
 /var/log/spooler {
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }
 
 /var/log/syslog {
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }
 
 /var/log/user {
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }
 
@@ -79,6 +68,5 @@
     olddir /var/log/archiv/mail
     postrotate
        /etc/rc.d/init.d/syslog-ng reload >/dev/null 2>&1
-       /etc/rc.d/init.d/klogd restart >/dev/null 2>&1
     endscript
 }