diff --git a/etc/syslog-ng.conf b/etc/syslog-ng.conf index e06055b29..453eb48a1 100644 --- a/etc/syslog-ng.conf +++ b/etc/syslog-ng.conf @@ -1,5 +1,5 @@ # -# /etc/syslog-ng/syslog-ng.conf +# /etc/syslog-ng.conf # options { @@ -12,12 +12,13 @@ options { create_dirs (no); keep_hostname (yes); perm(0640); + group("log"); }; source src { unix-stream("/dev/log"); internal(); - pipe("/proc/kmsg"); + file("/proc/kmsg"); }; destination authlog { file("/var/log/auth.log"); }; @@ -30,30 +31,33 @@ destination user { file("/var/log/user.log"); }; destination uucp { file("/var/log/uucp.log"); }; destination mail { file("/var/log/mail.log"); }; destination news { file("/var/log/news.log"); }; +destination ppp { file("/var/log/ppp.log"); }; #destination debug { file("/var/log/debug.log"); }; destination messages { file("/var/log/messages.log"); }; destination errors { file("/var/log/errors.log"); }; destination everything { file("/var/log/everything.log"); }; destination iptables { file("/var/log/iptables.log"); }; +destination acpid { file("/var/log/acpid.log"); }; destination console { usertty("root"); }; # Log everything to vc12 -destination console_all { file("/dev/tty12"); }; +destination console_all { file("/dev/vc/12"); }; filter f_auth { facility(auth); }; filter f_authpriv { facility(auth, authpriv); }; filter f_syslog { program(syslog-ng); }; filter f_cron { facility(cron); }; filter f_daemon { facility(daemon); }; -filter f_kernel { facility(kern); }; +filter f_kernel { facility(kern) and not filter(f_iptables); }; filter f_lpr { facility(lpr); }; filter f_mail { facility(mail); }; filter f_news { facility(news); }; filter f_user { facility(user); }; filter f_uucp { facility(cron); }; filter f_news { facility(news); }; +filter f_ppp { facility(local2); }; #filter f_debug { not facility(auth, authpriv, news, mail); }; -filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news) and not program(syslog-ng) and not match("IN=.*OUT="); }; +filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; filter f_emergency { level(emerg); }; filter f_info { level(info); }; @@ -61,8 +65,10 @@ filter f_notice { level(notice); }; filter f_warn { level(warn); }; filter f_crit { level(crit); }; filter f_err { level(err); }; -filter f_iptables { match("IN="); }; +filter f_iptables { match("IN=.*OUT="); }; +filter f_acpid { match("acpid"); }; +log { source(src); filter(f_acpid); destination(acpid); flags(final); }; log { source(src); filter(f_authpriv); destination(authlog); }; log { source(src); filter(f_syslog); destination(syslog); }; log { source(src); filter(f_cron); destination(cron); }; @@ -71,6 +77,7 @@ log { source(src); filter(f_kernel); destination(kernel); }; log { source(src); filter(f_lpr); destination(lpr); }; log { source(src); filter(f_mail); destination(mail); }; log { source(src); filter(f_news); destination(news); }; +log { source(src); filter(f_ppp); destination(ppp); }; log { source(src); filter(f_user); destination(user); }; log { source(src); filter(f_uucp); destination(uucp); }; #log { source(src); filter(f_debug); destination(debug); }; diff --git a/install/arch_pciutils b/install/arch_pciutils index 9830fa630..e20d56715 100644 --- a/install/arch_pciutils +++ b/install/arch_pciutils @@ -6,7 +6,8 @@ install () BINARIES="lspci setpci update-pciids" FILES="" SCRIPT="" - add_file "/usr/share/pci.ids" + add_file "/usr/share/pciutils/pci.ids" + add_file "/usr/sbin/update-pciids" } help () diff --git a/install/arch_usbutils b/install/arch_usbutils index e0d66d68a..35ae7f9bc 100644 --- a/install/arch_usbutils +++ b/install/arch_usbutils @@ -6,7 +6,8 @@ install () BINARIES="lsusb" FILES="" SCRIPT="" - add_file "/usr/share/usb.ids" + add_file "/usr/share/usbutils/usb.ids.gz" + add_file "/usr/sbin/update-usbids" } help ()