Updated syslog config to v3 and fixed init

diff --git a/config/syslog-ng/syslog-ng.conf b/config/syslog-ng/syslog-ng.conf
index b2eae14f8eed3e69377ebd71ca12a7df2d8e8f33..a5cd8e21b254193f5fee0be2be2db34b905ce417 100644 (file)
--- a/config/syslog-ng/syslog-ng.conf
+++ b/config/syslog-ng/syslog-ng.conf
@@ -1,85 +1,31 @@
-options { long_hostnames(off); sync(0); };
+@version:3.0
+options { long_hostnames(off); flush_lines(0); stats_freq(3600); };
 
 source src { unix-stream("/dev/log"); internal(); };
 source kernsrc { file("/proc/kmsg"); };
 
-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 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 local0 { file("/var/log/local0.log"); };
-destination local1 { file("/var/log/local1.log"); };
-destination all { file("/var/log/all.log"); };
-
-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 ids { program("/usr/sbin/ids-block"); );
+destination ids { program("/usr/sbin/ids-block"); };
 
 #destination loghost { tcp("10.0.0.1" port(514)); };
 
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
 filter f_syslog { not facility(authpriv, mail) and not match(ppp.*LCP); };
 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) and not match (imapd); };
-filter f_user { facility(user); };
-filter f_uucp { facility(cron); };
-filter f_ppp { program(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail) and not match(ppp.*LCP); };
-filter f_messages { level(info..warn)and not facility(auth, authpriv, mail, news); };
+filter f_messages { 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); };
-
 filter f_ids { facility(auth) and match("snort") and match("Priority: 1"); };
-filter f_ssh { program("sshd.*") and match("(Failed password for root from)") };
+filter f_ssh { program("sshd.*") and match("Failed password for root from"); };
 
-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(kernsrc); 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); };
-log { source(src); destination(console_all); };
-#log { source(src); destination(all); };
+log { source(src); source(kernsrc); filter(f_messages); destination(messages); };
+log { source(src); source(kernsrc); filter(f_emergency); destination(console); };
+log { source(src); source(kernsrc); destination(console_all); };
 
 log { source(src); filter(f_ids); destination(ids); };
 log { source(src); filter(f_ssh); destination(ids); };

diff --git a/src/initscripts/core/syslog-ng b/src/initscripts/core/syslog-ng
index 8f54578d7b5c57fe3e0456c04930d2ca69c3e636..c687938b182a0dbbd2192f1e20085109fb36f127 100644 (file)
--- a/src/initscripts/core/syslog-ng
+++ b/src/initscripts/core/syslog-ng
@@ -20,10 +20,11 @@
 
 MESSAGE="System Log Daemon"
 BIN_FILE="/sbin/syslog-ng"
+PIDFILE="/var/run/syslog-ng.pid"
 
 case "${1}" in
     start)
-        loadproc
+        loadproc -p "${PIDFILE}"
         evaluate_retval start
         ;;